Fixes #1139. ClassCastException when reading non String value from Java System.properties
Merge 1139