fix error loged for dynamic exception msgs
Merge remote-tracking branch 'upstream/master' into uno
Merge remote-tracking branch 'upstream/staging' into uno

Conflicts:
	RcmErrorHandler/config/module.config.php
fix brackets
Merge pull request #316 from rodmcnew/uno

restore form staging