Merge "Provides default dev-mapping.conf file in images"