Updated from openstack-manuals

Change-Id: I6c9b3dcda408bbd0581e3569f7953e749cce1d42