Can we merge or cherry-pick from master https://github.com/yahoo/storm-yarn/pull/36/files so that we do not lose history.

I think in general we should be back-porting relevant changes to master so that this branch does not diverge from master because of a non-h23 change.