Merge "Implement staged directory clean up for staged install"