Fix scc check-milestone tests
merge master -D org -I include -E exclude: PR 137 (Admin tools)