Revert wrong "rebase scape-2.x"

This reverts commit 19e99b9296812ef647194ffec01d3e38c6eeff22.
added new 2.x handling for intellectual entities
fixed lold classes
updated TCK to use scape-platform-datamodel 0.2.0-SNAPSHOT
Partial fixes for tck build and tests
fixed VersionList test
fixed retrieve BitStream test
Pulling latest changes from Frank Asseg (fasseg).

Trying to solve build issues for CI.