Updated from openstack-manuals

Change-Id: Ifa6cc52bb60117893371d5968b20ec6ae02970bc