452655
Merge branch '20171007_dvocc17' into 'production' dvocc17 test See merge request infra/salt!65