Merge "jjb/releng: fix partial image name matching"