Updated from openstack-manuals

Change-Id: Ief602ae541148bafdceca2dc91f4831895910e3f