Merge branch 'feature/solr_management' into 'master'

Feature/solr management

See merge request !14
Status Job ID Name Coverage
  Build
canceled #1696
build

 
  Test
canceled #1698
allowed to fail
codequality

canceled #1697
test