Merge "Remove salt-master, reclass from pkg dependencis"