Updated from openstack-manuals

Change-Id: I5231552d11a1be25212290c9417a896aadf48ecf