Merge remote-tracking branch 'origin/topic/vern/any-typetype-when-fix'

- Minor whitespace adjutment in merge

* origin/topic/vern/any-typetype-when-fix:
  bug fixes for using "when" in functions that have a local of type "any"

testing/btest/Baseline/language.any-when/out

@@ -0,0 +1 @@
+9

testing/btest/language/any-when.zeek

@@ -0,0 +1,19 @@
+# @TEST-EXEC: zeek -b %INPUT >out
+# @TEST-EXEC: btest-diff out
+
+type c: count;
+function foo(): count
+	{
+	local bar: any;
+	bar = c;
+	return when ( 5 > 3 )
+		{
+		return 9;
+		}
+	}
+
+event zeek_init()
+	{
+	when ( local b = foo() )
+		print b;
+	}