Start cleanup.
Add relationship correctly.
Add test.
Merge in 3.x
Merge pull request #2918 from openscholar/2898-amitai

Fix Views relationship, to allow views to work out of vsite