Updated from openstack-manuals

Change-Id: Ib220ded5b2bd6a00126bdab23780c46ed01a46c9