Updated from openstack-manuals

Change-Id: Iabfba3c875f252e83b99c051b12b0aedcf036706