Run drush @hostmaster clean-modules before and after upgrade.
Merge branch 'refs/heads/master' into 2.2.x-legacy