Fixed diffs & incorrectly hard coded NR GUIDs
Merge branch 'nr-components-repack' of https://github.com/Terracotta-OSS/terracotta-newrelic-plugin into nr-components-repack

Conflicts:
	src/main/java/com/terracotta/nrplugin/cache/MetricCacher.java
Merge branch 'nr-components-repack' of https://github.com/Terracotta-OSS/terracotta-newrelic-plugin into nr-components-repack

Conflicts:
	src/main/java/com/terracotta/nrplugin/cache/MetricCacher.java