[Orchestrator] Backporting bug fixes for 1.9.4 release#2734

lokanandaprabhu merged 2 commits intoworkspace/orchestratorredhat-developer/rhdh-plugins:workspace/orchestratorfrom

orchestrator-1.9-backportredhat-developer/rhdh-plugins:orchestrator-1.9-backportCopy head branch name to clipboard