ISPN-4498 OutOfMemoryError when CI is ran with tracing

* Commented out usage of NDC for now
ISPN-2976 Upgrade to Log4j 2.0