Merge pull request #224 from nhr/ha_tweaks

Tweaks to support HA deployment
Restored list joins
Merge pull request #226 from nhr/ha_fixes

HA fixes