Merge pull request #3284 from Ethanlm/STORM-3271

[STORM-3271] Refactor ResourceIsolationInterface in preparation for container support