Clean up some references, use guid's to identify nodes in NodeViewCustomization tests
Remove more copy local
Merge pull request #3419 from pboyer/nvtfixes

Make NodeViewCustomization tests less flaky
Merge remote-tracking branch 'upstream/master'