Merge pull request #653 from arsogukpinar/master

Fix for name conflict

roles/openshift_examples/files/examples/xpaas-templates/eap6-https-sti.json

@@ -6,10 +6,10 @@
             "iconClass" : "icon-jboss",
             "description": "Application template for EAP 6 applications built using STI."
         },
-        "name": "eap6-basic-sti"
+        "name": "eap6-https-sti"
     },
     "labels": {
-        "template": "eap6-basic-sti"
+        "template": "eap6-https-sti"
     },
     "parameters": [
         {