Previous work from sdruskat/saltomic integrated
Merge branch 'pepper_i9n' of https://mgruebsch@github.com/infraling/atomic.git into pepper_i9n