Updated from openstack-manuals

Change-Id: I7096f9cf052ca7c250417e96bc985c3b0fdf3e5c