Updated from openstack-manuals

Change-Id: Id48c4a69f0d89193bde268b286a8190478ffcf40