Adding an excluded/ directory in the conf templates
Merge branch '14.06'