Codesniff cleanup for user admin model
Merge remote-tracking branch 'dstockto/cs_user_admin_model'