Updated from openstack-manuals

Change-Id: I767b861e49824632a3a4eb93b5a0531c9f1dc6f5