SAK-25661 prep clog to build against Sakai 10 trunk