Merge pull request #3642 from reiabreu/master

STORM-4060: exposing Netty flush timeout as a configurable property