zookeeper client check fails when security enabled

Deployed cluster with 2 hosts. First has zookeeper server and second has
zookeeper client. After enabling security zookeeper client check fails:

2014-05-05 15:06:11,168 - Error while executing command 'service_check':
Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/resource_management/libraries/script/script.py", line 105, in execute
method(env)
File "/var/lib/ambari-agent/cache/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/service_check.py", line 43, in service_check
logoutput=True
File "/usr/lib/python2.6/site-packages/resource_management/core/base.py", line 148, in _init_
self.env.run()
File "/usr/lib/python2.6/site-packages/resource_management/core/environment.py", line 149, in run
self.run_action(resource, action)
File "/usr/lib/python2.6/site-packages/resource_management/core/environment.py", line 115, in run_action
provider_action()
File "/usr/lib/python2.6/site-packages/resource_management/core/providers/system.py", line 239, in action_run
raise ex
Fail: Execution of '/tmp/zkSmoke.sh /usr/lib/zookeeper/bin/zkCli.sh ambari-qa /etc/zookeeper/conf 2181 True /usr/bin/kinit /etc/security/keytabs/smokeuser.headless.keytab' returned 1. zk_node1=c6401.ambari.apache.org

This seems to be connected with zookeeper_client_jaas.conf
After adding

principal="zookeeper/c6402.ambari.apache.org@EXAMPLE.COM";

to zookeeper_client_jaas.conf zookeeper client check passes fine.
Think we should add this line to template.