Merge "adapt sdnc-image to latest baseimage"