Optimize noservices condition + fix missing pillar param
5 files changed