Fix regression with ResourceClass/Flavor from recent rebase hell
Merge pull request #61 from marios/fix_resource_class_flavor_regression

Fix regression with ResourceClass/Flavor from recent rebase hell