Update to most recent galago-3.5, temporarily disable scm-ciir