Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Add missing copyright header to SamlWebFilterIT.java
  Remove httpDisplaynameHeader config option
  Support display names with non-ISO-8859-1 characters

Change-Id: I0cbb4d704378c0cc2e15dbccbb26007551b02153