JCRVLT-64 Nodes that have a user parent are not installed if they are in the same .content.xml as their parent

- fixed primary bug
- also fixed parts of JCRVLT-66 if the data is in the same aggregate.
  in case there is more content on separate aggregates, the remapping is not honoured.

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk@1635675 13f79535-47bb-0310-9956-ffa450edef68