Fixes #5040: Fix organization wide auto attach of subscriptions via API and UI.
fixes #6301 - correcting host/guest
Merge pull request #4307 from ehelms/fixes-5040

Fixes #5040: Fix organization wide auto attach of subscriptions via API ...
Merge pull request #4316 from thomasmckay/6301-api-guests

fixes #6301 - correcting host/guest