Makes make_build_env correctly detect ccspap2 service user
Makes make_build_env correctly detect ccspap2 service user

UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts,UCL-RITS/rcps-buildscripts