STORM-493: Workers inherit storm.conf.file/storm.options properties of their supervisor
Merge branch 'STORM-493' of https://github.com/chrisz/incubator-storm into STORM-493