Bug 996383 - [System] Split duplicate entities in system.properties