Merge remote-tracking branch 'origin/master' into feature/BACKLOG-860
Merge remote-tracking branch 'origin/master' into metadatafix
Merge branch 'metadatafix'
Added todo
Updated release notes
New attribute definitions based on attributes-v2.0.0.json:
- Remove aliases for commonname, gn, rfc822Mailbox etc
- Remove aliases for surffederatie_nl
- Rename SURFfederatie to SURFconext
make attributes-SURFconext.json the default attribute definitions.
BACKLOG-915 Patch. Remove '/migrate' during transparent proxy
BACKLOG-864 Changed parsing xml without to with Namespaces
Merge remote-tracking branch 'origin/master' into feature/BACKLOG-860
Merge branch 'feature/BACKLOG-860'
Merge remote-tracking branch 'origin/master' into feature/BACKLOG-882
Merge branch 'feature/BACKLOG-882'
Updated release notes
Merge branch 'release-3.0'
Corrected release notes
Merge branch 'release-3.0'
BACKLOG-923 Config files are now parsed first and merged afterwards which makes debugging errors in files a lot easier.
BACKLOG-923 Made config parse exception message a little more verbose
BACKLOG-923 returned to strategy of merging config file first and only parse one string, with a fallback to parse each file separately in case of parse errors