Brings more consistency in property lists.
Contains also an opportunist NullPointerException fix.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1541637 13f79535-47bb-0310-9956-ffa450edef68