Merge "Ignore empty locale list when diffing Configuration objects"