Updated from openstack-manuals

Change-Id: Ie0ab32aba6d9a0cb4f2b40b253fdb06f567dc885