STORM-63 remove timeout drpc request from its function's request queue
fix added code not in when-let block
Merge branch 'STORM-63' of https://github.com/xiaokang/incubator-storm into STORM-63

STORM-63: remove timeout drpc request from its function's request queue
Added STORM-63 to Changelog.