ContentHost CLI tests now use Org ID.

Fixes issue #840 and makes sure that Organization 'ID' is used instead
of 'Label'.