JBIDE-16819 - messed up tracing. Null check added
JBDS-2848 Usage Stats for actual used features