Adding old saltmaster change, probably to be reworked soon
barbican/ subdirectory
saltmaster/ subdirectory
template/ subdirectory
Move localrc and patches/ into barbican/