Pull upstream develop for salt-testing
Add python-apt installed state to Ubuntu