user model changes for shib autocreation
controller changes for autocreate shib
fix merge conflict