Merge "saltstack to take env and file param"