Updated from openstack-manuals

Change-Id: I04f53b558f96fcf22379914db28c437dc1777b08