Cleaning up how the New Relic class is passed to the support class. #14137808545155
Merge branch 'master' into version2