added concat::setup for some reason (CVMFS!!!)
Merge branch 'dev' of github.com:uobdic/dice_T2_puppet_config into dev