[maven-release-plugin] prepare for next development iteration
Merge branch 'release/3.6' into dev
[issue #36] correct l10n
Merge branch 'bug/36-wrong-domainserver-options-l10n' into dev
[maven-release-plugin] prepare release abf-3.6.1
Merge tag 'abf-3.6.1'

[maven-release-plugin]  copy for tag abf-3.6.1