Merge "Rename devops_portal service variables to increasing visibility"