This bug was initially created as a copy of Bug #1766587 I am copying this bug because: Description of problem: There were few review comments on https://github.com/openshift/console/pull/2359, which were not handled in this PR. A separate PR should be sent for these follow up changes.