hg: jdk/client: 8214552: Resolve clash between 4947890 and 8130264

[philip.race at oracle.com]

Changeset: 84cc04e403ab
Author:    prr
Date:      2018-11-30 12:21 -0800
URL:       http://hg.openjdk.java.net/jdk/client/rev/84cc04e403ab

8214552: Resolve clash between 4947890 and 8130264
Reviewed-by: rriggs, mchung

! src/java.base/share/classes/jdk/internal/util/SystemProps.java
! test/jdk/java/awt/print/PrinterJob/CheckPrinterJobSystemProperty.java