Merge "jjb/releng: fix compass container build error"