Refactoring in salt functions

Complete refactoring of Orchestrate.groovy salt calls, fix bugs and
simplify code.

Change-Id: I5eced97df6b050c74932ea58254a0fa95e3d9849
3 files changed