3242 query by example hardening

Conflicts:

	src/main/java/oscar/oscarReport/pageUtil/RptByExampleAction.java
3243 inbox broken - need jquery update
changed info log stmt to debug
1003 Parse CML HIN (PID-2) properly
Merge "3243 inbox broken - need jquery update" into RELEASE_12_1
Merge "changed info log stmt to debug" into RELEASE_12_1
Merge "1003 Parse CML HIN (PID-2) properly" into RELEASE_12_1
3232 Measurements not saved from eChart

fixes the demographic_no=0 problem in 12.1
Merge "3232 Measurements not saved from eChart" into RELEASE_12_1
3198 - #3199 - Lab Patient Search
minor i18n fixes to eForm generator from upstream commit

Change-Id: Iaac6f99f9b56f4f6eaa1581a6254bf55cf6f8c08
Merge "minor i18n fixes to eForm generator from upstream commit" into RELEASE_12_1