Manifest cleanup

Align more with jb43 manifest and fix up CM branches to allow gerrit use