Deployment orchestrator refactoring 1st step

Change-Id: I78e15b51ca7788c3aef8dfb27af3f932aaa0ab6f
Merge "Deployment orchestrator refactoring 1st step"