Merge back ACPI namespace scan code changes for v4.12.