Merge pull request #609 from dburdick/swc-908

Swc 908
Merge pull request #611 from dburdick/swc-908

Small portal fixes: swc-903, swc-896, swc-914, swc-468, swc-916, swc-924...
Merge branch 'release-16' into develop