Updated from openstack-manuals

Change-Id: I78bb5075b66d965b080d45a533dec97bae0b7185