TRUNK-3875: Upgrade xstream to 1.4.3
Attempting to save an alert without text should display a more user friendly error message - TRUNK-2975

added some changes

Cleaned up code in AlertValidator
Fix error message for visit attribute types - TRUNK-3230
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

Added @since and javadocs for getters and setters of
userContext.locationId - TRUNK-3883
Concept form and ConceptProposal form should use the same list of
locales - TRUNK-3828
TRUNK-3892: providerDAO.getProvidersByPerson(person, false) returns only retired providers, when it should return only *non-retired* providers