TRUNK-4099 Daemon user cannot save a user
TRUNK-4038: Location tree widget truncates location names with an
apostrophe
TRUNK-4005: Form schema drop-down encounter type menu should not display
retired encounter types
Merge pull request #407 from lluismf/TRUNK-4005

TRUNK-4005: Form schema drop-down encounter type menu should not display retired encounter types
TRUNK-3942:Possible XXE attacks when parsing downloaded xml files
Merge pull request #406 from lluismf/TRUNK-4038

TRUNK-4038: Location tree widget truncates location names with an apostrophe
TRUNK-4105: Added index for code column on concept_reference_term
Merge pull request #409 from devcritter/TRUNK-4105

TRUNK-4105: Added index for code column on concept_reference_term
[TRUNK-4102] The uuid of Unknown location in test data is inconsistent
Merge pull request #415 from k-joseph/TRUNK-4102

TRUNK-4102
Module activator started methods not called in correct order for required modules - TRUNK-3922
Merge pull request #408 from lluismf/TRUNK-3942

TRUNK-3942:Possible XXE attacks when parsing downloaded xml files
Possible XXE attacks when parsing downloaded xml files for
MigrationHelper - TRUNK-3942
Merge pull request #313 from WolfSchlegel/TRUNK-2472

Trunk 2472
Follow up to fix bug where a module can't be stopped or reinstalled - TRUNK-3922
integrating search for person attributes with patient search