Merge "Fix docker snapshot job choosing-strategy"