Merge pull request #1480 from apache/juerg/ci

CI improvements