test refactorings
refactoring, RelationshipUtils class, removing warnings and deprecated calls
fix tests
dependency changes and todo - preparation to remove some deprecated stuff
extra API call + test in RelationshipUtils
javadoc update
Merge branch 'master' into flow-changes