Merge "Add Salt 2018.3 tests and fix readme"