Allow masqueraders to exit from user when required fields needed

Bug 1321499
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Change-Id: I3fa5a12a75321996ea3eac934d891a34bef14b8f
Merge "Allow masqueraders to exit from user when required fields needed"