Merge pull request #2179 from waldenraines/fix_org_switcher_issues

Fix a couple of org switcher issues
2163-sys-facts - incorrectly setting additional methods for json
Merge pull request #2181 from thomasmckay/2163-sys-facts

2163-sys-facts - incorrectly setting additional methods for json
Fixing #2178 by repopulating the org switcher menu each time it's opened.