Couple changes to user Expiration date behavior
Fixed UnitTest to match new behavior and added new test
Fixes https://github.com/TeamMentor/Master/issues/277
Merge branch 'Issue_277'