Hash database configuration management fixes
Merge pull request #361 from rcordovano/develop-rc1

Hash database configuration management fixes