Issue #2808337 by jhedstrom, chx, jibran, Berdir, larowlan: Make use of proposed entity table relationship refactor