Don't use "PSR2.Namespaces.NamespaceDeclaration" in favor of our own implementation
Merge branch 'master' into in-portal

* master:
  Don't use "PSR2.Namespaces.NamespaceDeclaration" in favor of our own implementation