Updated from openstack-manuals

Change-Id: Ie84ff4b008a5333dbb415b2845afae94cd38b090