Merge pull request #1696 from ZitaNemeckova/instance_action_fix

Fix Power actions for Instances in Orchestration Stack page
(cherry picked from commit ea9f54c)

https://bugzilla.redhat.com/show_bug.cgi?id=1479927

app/controllers/application_controller/ci_processing.rb

@@ -1829,7 +1829,7 @@ def vm_button_operation(method, display_name, partial_after_single_selection = n
     klass = get_rec_cls
     # Either a list or coming from a different controller (eg from host screen, go to its selected_items)
     if @lastaction == "show_list" ||
-       !%w(orchestration_stack service vm_cloud vm_infra vm miq_template vm_or_template).include?(
+       !%w(service vm_cloud vm_infra vm miq_template vm_or_template).include?(
          request.parameters["controller"]) # showing a list
 
       # FIXME retrieving vms from DB two times
@@ -1941,7 +1941,7 @@ def get_rec_cls
     when "miq_template"
       return MiqTemplate
     when "orchestration_stack"
-      return OrchestrationStack
+      params[:display] == "instances" ? VmOrTemplate : OrchestrationStack
     when "service"
       return Service
     when "cloud_object_store_container"