CR-3638 / OPENICF-230 – Schema and the related builder classes in Java and .Net are not consistent

git-svn-id: https://svn.forgerock.org/openicf/trunk@6546 05b3e5af-d696-470f-a577-fd7599f74d3c