Code cleanup for wsactions/user/Role.php
Merge branch 'dstockto-role_cleanup'