Fix for STORM-244
Minor improvement
Speed up new test
Adding timeout-check-secs function
Merge branch 'STORM-244' of https://github.com/knusbaum/incubator-storm into STORM-244

Conflicts:
	storm-core/src/clj/backtype/storm/daemon/drpc.clj

STORM-244: DRPC timeout can return null instead of throwing an exception
Add STORM-244 to Changelog.
Merge remote-tracking branch 'apache/master' into STORM-335

Conflicts:
	storm-core/test/clj/backtype/storm/drpc_test.clj