More portability/compatibility changes
Fix spec call leader binding conflicts
Add saltstack statefile syntax