make dynamic master resource configuration work again
Merge branch 'master' into fix-config
Merge pull request #251 from metamx/fix-config

Make dynamic master resource configuration work again