ME: code refactor to fix failing user viewset tests
ME: code refactor to fix failing user viewset tests

piqoni/onadata,hnjamba/onaclone,qlands/onadata,piqoni/onadata,smn/onadata,hnjamba/onaclone,sounay/flaminggo-test,spatialdev/onadata,sounay/flaminggo-test,sounay/flaminggo-test,qlands/onadata,hnjamba/onaclone,hnjamba/onaclone,smn/onadata,GeoODK/onadata,qlands/onadata,spatialdev/onadata,qlands/onadata,spatialdev/onadata,piqoni/onadata,spatialdev/onadata,piqoni/onadata,GeoODK/onadata,smn/onadata,GeoODK/onadata,sounay/flaminggo-test,smn/onadata,GeoODK/onadata