Sorted out broken unit test and added newrelic jarfile.
Merge remote-tracking branch 'origin/master'
Further attempt to get github and repo (local) synchronised...