fixes #6290 / BZ 1111078 - fix host <-> content host association during registration

This commit fixes the association of the host to content host that is
performed during registration.  The code previously utilized the organization
instance variable that was obtained by the before_filters; however,
those filters are no longer used.
Merge pull request #4305 from bbuckingham/issue-6290

fixes #6290 / BZ 1111078 - fix host <-> content host association during registration