Merge "Refactor resource creation and cleanup in rally"