Merge "Update Centos 7 devstack images"