proxy - x-forwarded headers remove list made configurable - see #782
Merge branch '14.06'

Conflicts:
	config/configurations/template