Bug 996383 - [System] Split duplicate entities in system.properties
Merge pull request #18318 from flodolo/bug996383

Bug 996383 - [System] Split duplicate entities in system.properties, r=timdream