Improve validation for solrEnabled flag
Merge pull request #1283 from julceslauhub/master

Improve validation for solrEnabled flag