Fixed header bug in templates. Fixed ConfigurationProperties template. refs #506