Updated from openstack-manuals

Change-Id: Ib1df23435ff4e9671ac532d58864409a6d72bd3f