feature freeze to prevent breakages

Rolling CM repos eventually introduced breakages.

We need to stabilise the tree by pointing to explicit revisions, and rebase
carefully thereafter.

Change-Id: I85fd2687c2e5a426d6c7379218a22dd082fdcb6c