Sync up with yahoo/storm-yarn master

This reverts commit 90d099023512fd4f05e24832bce993c54eee7038.