Add --rabbit_password argument to api-server
zookeeper version 3.4.5 -> 3.4.6
Merge pull request #30 from TapioT/master

zookeeper version 3.4.5 -> 3.4.6
Fix zookeeper invocation after version update
API server needs new options - redis server IP and admin token
g-api does not seem to be needed on compute node
Merge branch 'master' into devel

Conflicts:
	contrail/setup_contrail.py
	lib/neutron_thirdparty/contrail