Merge pull request #3175 from Microsoft/release-1.5

Merge release-1.5 into master

tests/cases/fourslash/aliasMergingWithNamespace.ts

@@ -0,0 +1,9 @@
+///<reference path="fourslash.ts"/>
+
+////namespace bar { }
+////import bar = bar/**/;
+
+goTo.marker();
+verify.quickInfoIs(
+`namespace bar
+import bar = bar`);