Update cpp-common ref & back out schema hack