Adding substitutes to worker childopts.
Correcting function formatting
Merge branch 'master' into childopts-replacements
Simplify childopts function and clean-up unit tests
Remove unwanted functions from supervisor-test
Refactor method substitute-childopts to use cond and cleaner asserts in unit tests
Refactor substitute-childopts to use clojure.string/split and fix unit tests
Reformatting function and comments
Fix config description for worker.childopts
Merge branch 'master' into childopts-replacements

Conflicts:
	storm-core/test/clj/backtype/storm/supervisor_test.clj
Remove unwanted spaces
Use TOPOLOGY-ID instead of STORM-ID
Merge branch 'childopts-replacements' of https://github.com/kishorvpatil/incubator-storm into STORM-373

STORM-373: Provide Additional String substitutions for *.worker.childopts
Added STORM-373 to Changelog