* port PR #5978 CCDA import merge duplicate fix
- ensure if unstructured and CDA then combine/merge
- fix deleter to auto close after 2 sec or immediate for encounters.

* - fix careplan report to use passed in encounter id instead of session data.

* - additional attempt to get author for portal using hie_primary

* - ensure newly create users aren't duplicated one day I'll get this right!