2946 - master demographic - quotes in city field cause truncation on edit
Change-Id: Idb4c8c34d0b8a97cefeacd4310892b115d473d1e
ID:3529194 Update BORN18M upload

Bugfix: changed convert to BigDecimal function to not use "Long" time as intermediate
Bugfix: changed ap-names "risk_factors" & "family_history" to have a "_json" suffix
Bugfix: corrected (") & (') breaking textbox display in eforms
Bugfix: corrected empty information immunizations get uploaded
- reconstructed Extended eform tags to be more efficient
- added a database ap and changed code to load all fields from another eform as json object

Change-Id: I8997e1dd4dc83e213f7c1c981f246d623e572083
Bug#3055 FTPS upload to BORN repository not working

Changed to use protocol SFTP

Change-Id: Ibe76934e5ffc2e70dea11a590f165af2e5e9a57c
#981 Periodic Health Visit - Update PHV Flowsheet 

Removing Measurement:
Parents with Children
o   All related logic questions (a, b, c)

Changing Measurement:
Do you have your eyes regularly checked?
o   Change: this will be for people age 65 and older ONLY

New Measurements to add:
-STI Screening
-Safe Sex Counselling
-Calcium and Vitamin D

Change-Id: I1bd51bc71629e1c7248d97aebadf12e2c54a4fc2
Merge "#981 Periodic Health Visit - Update PHV Flowsheet "
Merge "2946 - master demographic - quotes in city field cause truncation on edit Change-Id: Idb4c8c34d0b8a97cefeacd4310892b115d473d1e"
2936 - Letter not a paper size option in Rx printout
Merge "Bug#3055 FTPS upload to BORN repository not working"
Bug#3055 FTPS upload to BORN repository not working

Bugfix: Use DefaultSftpSessionFactory for uploadONAREnhancedDataToRepository()

Change-Id: Ie520a54d2ffde919abe36e0e71aeca8762f2aded
Bug#3057 BORN18M upload timer not running

- changed the bean id for "org.springframework.scheduling.timer.TimerFactoryBean" in applicatonContext to be unique
- combine ModuleNames for BORN and BORN18M into 1 line. If separated, only the last one is enabled

Change-Id: If221b35b90f513ad1cbd9650b25a4d2e29f440ab
Merge "Bug#3055 FTPS upload to BORN repository not working"
#981 Periodic Health Visit - Update PHV Flowsheet 
-display MCCS based on POSK value

Change-Id: I68b801636de0fc559ea06ac82999c18398c7c95e
Bug#3055 FTPS upload to BORN repository not working

corrected oscar_mcmaster.properties place holder
:
Merge "#981 Periodic Health Visit - Update PHV Flowsheet  -display MCCS based on POSK value"