Renaming /op/tapache-solr-x.x.x to /opt/solr instead of symlinking, because it prevents mounting
Merge branch 'master' into 3.6.0