New Relic 3.6

This change update the version of New Relic to 3.6.+
Dependency Updates

This change updates the versions of dependencies.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	java-buildpack.iml