Merge "Update CentOS 7 devstack Ocata image"