Updated from openstack-manuals

Change-Id: I0097d2a54b2f0e1d6ab0708642a76aadee9cdf46