Updated from openstack-manuals

Change-Id: Iee5c2a536a29ea467e2595a118cb2f008402e76e