Updates for NX 2.4

https://issues.sonatype.org/browse/NXCM-4997