Updated from openstack-manuals

Change-Id: Ib62bfda8dae91178d71b50ae0428f3d09064fce6