Update CB dependency to 1.6.4-R2.1-SNAPSHOT
Package and class changes to support planned InanimatePets