Merge remote-tracking branch 'origin/release26.3-SNAPSHOT' into 26.3_fb_sql_server_migration_1

Author: labkey-bpatel

core/webapp/Ext.ux.form.LovCombo.js

@@ -293,8 +293,10 @@ Ext.ux.form.LovCombo = Ext.extend(Ext.form.ComboBox, {
                 this.store.suspendEvents(true);
 				this.store.clearFilter();
 				this.store.each(function (r) {
+					// GH Issue 1266: String() (not JSON.stringify) so native RegExp.escape doesn't throw on a
+					// numeric valueField, while string values stay unquoted to match getCheckedValue() output.
 					var checked = !(!v.match(
-							'(^|' + this.separator + ')' + RegExp.escape(JSON.stringify(r.get(this.valueField)))
+							'(^|' + this.separator + ')' + RegExp.escape(String(r.get(this.valueField)))
 							+ '(' + this.separator + '|$)'));
 					r.set(this.checkField, checked);
 				}, this);

mothership/src/org/labkey/mothership/MothershipController.java

@@ -1923,8 +1923,9 @@ public void testUpdateInstallationContainerScoping() throws Exception
         public void testUpdateStackTraceContainerScoping() throws Exception
         {
             User admin = getAdmin();
-            Container folderA = createContainer("A");
-            Container folderB = createContainer("B");
+            MothershipModule module = ModuleLoader.getInstance().getModule(MothershipModule.class);
+            Container folderA = createContainer("A", module);
+            Container folderB = createContainer("B", module);
 
             // An exception stack trace that lives in folder B (StackTraceHash is derived from the stack trace text)
             ExceptionStackTrace st = new ExceptionStackTrace();