CLOUDIFY-2512 removed validation code due to wrong branching