Updated from openstack-manuals

Change-Id: Id974cde02553f5cdac132ab9c659ec9829f7e118