Some restructuring in JoinManager
Merge origin/master
Merge origin/master
Added JPA version switch for join - ON/WITH