Cbus update to support current CGate

Pull #326 was based off of the stable branch and was merged into stable by accident.

This pull request cherry picks the same commits, bases them off of master and can be used to pull them into the master branch.