Infosec related changes and minor UI chages

Changes available in this release: CRIC-1983, CRIC-1986, CRIC-1987, CRIC-2010, CRIC-2011, CRIC-2037, CRIC-2042, CRIC-2078, CRIC-2081