fixing merge error and removing EFK
fixing merge error and removing EFK

vikram-redhat/openshift-docs,vikram-redhat/openshift-docs,vikram-redhat/openshift-docs,vikram-redhat/openshift-docs,vikram-redhat/openshift-docs