STORM-492 with reverting previous merge

First of all, I'm sorry for mistake.
It's for reverting broken #279 and reapply correct patch (using System Environment, not JVM Property).
So you can find further information from #279.

If Storm project has a rule about reverting and this PR doesn't fit, I'll wait @clockfly to revert, and re-create PR.

@ptgoetz @clockfly @harshach Please take a look and comment. Thanks in advance.