Tweaks to support HA deployment
Merge pull request #224 from nhr/ha_tweaks

Tweaks to support HA deployment
Merge pull request #225 from nhr/ha_tweaks

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

HA fixes
Merge pull request #227 from nhr/ha_fixes

Restored list joins
Fixed typo
Merge pull request #228 from nhr/ha_tweaked

HA tweaked