lets keep aegir contrib out of this.
adding solr and hosting tasks extra
Merge branch '6.x-1.x' of github.com:thinkdrop/devmaster into 6.x-1.x