NEXUS-5755: Undoing nullable
NEXUS-5755: Plx test did not scan

And missed components after plx-sisu change