Merge pull request #2999 from agresch/agresch_YSTORM-6160

STORM-3377 fix scheduling bug with min worker cpu enabled