remove deprecated relationship stuff in EE 2.6
Merge branch 'master' into develop