UserContext should store locationId instead of the Location object - TRUNK-3883

added some changes

applying auto commit changes

Fixed userContext.getLocation to return null when locationId is null -
TRUNK-3883