Merge "Add test to verify we cleanup staging directory on success and failure" into sc-dev