Updated from openstack-manuals

Change-Id: I342b4db5314c8885a4fbf9c0c9138f4ce055cadb