fix for a sessions bug in encounter screen
Correct calls to sqlStatement to actually pass in the argument array.

These errors were found by PHPLint.
added units to table display.
Improved robustness of updating sqlconf.php.
Merge into fix for patch tracker item id 3386015; php lint errors
absolute links for URLs in embedded patient summary stats in stats.php
Pull in first conflict from development branch

Resolution was simple, relative URL had been extended with more parameters so made the new URL absolute.
Resolve conflicts against development branch

URL now varies, make both variants absolute.
Add short-hand functions for htmlspecialchars()
Replace other global "out" function.
Merge branch 'patches-3317527'
Prepare/refactor ubuntu-debian package for 4.1 (still need to test)
Added tables/sql mods to upgrade script that were not included in 2.8.3_2.9.0 upgrade script
PQRI reporting bug fixes contributed by Visolve
The CDR active alert feature is now functional:

 -Rules that are set as Active Alerts will pop up
  a modal when opening a patient summary screen
  if a action is due.
CDR engine. Allow procedure codes:

 -Added procedure code for the Coumadin Management - INR Monitoring rule
CDR engine updates:

 -Now will support procedures as filters
 -Changed the adult weight rule to only require
  one weight recording rather than two.
 -Changed the adult weight rule to have a
  mininum age filter of 18.
 -Fixed a bug that involved rules with
  multiple target group ids.
SF Patch Id 3387325: Convenience Wrappers for htmlspecialchars
Added a language selector to the onsite patient portal.

 -Settings of the language can be set in Administration->
  Globals->Locale (uses the same mechanism/settings
  as the main OpenEMR login)
 -Also migrated the main portal settings to Administration->
  Globals->Portal.
translation login feature bug fix