Merge "Fix interpolation collision between openstack/stacklight for cicd"