Update dev with RC6 release changes

Includes:
 - backported fixes
 - the changlog update
 - the libSplash bump to 1.2.3+
 - the graceful cmake abort for #588 (hotfix)