Continuing to keep the jlink-dev branch in sync with ubi9 changes is too much work. Let's merge it down to the ubi9 branch, keeping a separate image descriptor for the link TP image, to reduce it.