Merge "Strip off amsterdam jenkins daily job for CLI"