Updated to allow v4 and v5 of CBFS to co-exist.
Merge remote-tracking branch 'origin/next' into api