Merged back changes from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5952 9e4fa352-aafb-0310-9071-df624684024b
Merged back changes from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5953 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1473 Add support for multiple customer notes linked to estimates and invoices

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5954 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1468 Add presenting complaint and diagnosis to Problem
Improved query support to enable substring queries.

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5959 9e4fa352-aafb-0310-9071-df624684024b
Changes for removal of default UserRules constructor

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5966 9e4fa352-aafb-0310-9071-df624684024b
Removed LookupNameHelper.getLookupName(NodeDescriptor descriptor, IMObject context) replacing use with getName(IMObject object, String node)

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5967 9e4fa352-aafb-0310-9071-df624684024b
Refactored ScheduleCRUDWindow to require an ScheduleActions passed at construction

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5968 9e4fa352-aafb-0310-9071-df624684024b
Added support for system messages other than act.systemMessage

git-svn-id: svn://svn.openvpms.org/openvpms/vpms/branches/1.8-dev@5969 9e4fa352-aafb-0310-9071-df624684024b
Merge branch '1.8-dev'

Conflicts:
	openvpms-web-workspaces/src/main/java/org/openvpms/web/workspace/patient/mr/ProblemRecordCRUDWindow.java