Updated SystemOverviewTest to comply with the changed application names
Merge branch 'master' into NAS-2383
NAS-2383 Cleaning up obsolete JUnit4 classes