Fix for bug 1012138
Bug 981780 - Fail reload if database is not running
Merge pull request #3708 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #3710 from jwhonce/bug/981780

Merged by openshift-bot