added v1 namespace for faucet proxy
fixed merge conflicts
added newrelic
tweaked nr config