add drpc test for removing timed out requests from queue
Merge remote-tracking branch 'apache/master' into STORM-335

Conflicts:
	storm-core/test/clj/backtype/storm/drpc_test.clj
Merge branch 'STORM-335' of github.com:d2r/incubator-storm
update changelog for STORM-335