STORM-248 STORM-322 proposal for fix

Details are in JIRA https://issues.apache.org/jira/browse/STORM-248.
As a collateral benefit, this also addresses JIRA https://issues.apache.org/jira/browse/STORM-322.
Could you please review ?