Added template fallback for multisites templates
Merge branch 'master' of github.com:opps/opps

* 'master' of github.com:opps/opps:
  Fix container migration
Added remove tmp files in make test command