Updated from openstack-manuals

Change-Id: I949708dc3a1a61d927943acd3af4be5e2015a637