Merge "Mavenized image creation for readiness-check"