Merge "Added identity information to salt minion conf"