Merge "Adjust repo namespace for pbr"