Fix tree returned by addonTreesFor('styles') not being included
Merge branch 'styles-addon-trees'

* styles-addon-trees:
  Fix tree returned by addonTreesFor('styles') not being included