merge commit
jfg-359 (Do not remove tests and metrics while select new sessions)
jfg-443(custom metric collectors are not displayed in webUI)