Merge "Revert "Correct error in Configuration.updateFrom""