Updated from openstack-manuals

Change-Id: Ia7ccb65179fbe5acc9aaf4f4ae77e75837e1edc1