FOP-2311: revert changes from FOP-1069 that regresses shorthand property handling.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1538062 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' into fop-2311-shorthand-property-order