Merge "Refactor config drive mounting"