Fix typos, conditionalize image versions, remove diag version string
Fix typos, conditionalize image versions, remove diag version string

xiaoping378/openshift-docs,xiaoping378/openshift-docs,xiaoping378/openshift-docs