Github user revans2 commented on the issue:
https://github.com/apache/storm/pull/2805
@kishorvpatil yes but the merge conflicts are minor. I wanted to get this
reviewed so @srdo can address any review comments at the same time as fixing
the merge conflicts so we can get this in ASAP and have a 2.0.0 RC out ASAP.---
