Merge branch 'hotfix/2.2.1'
merging hotfix/2.2.1' into master
Merge branch 'release/2.3.0'
merging release/2.3.0' into master
Fixed broken cq:dropTargets config
updating poms for 2.3.1 hotfix
updating poms for 2.3.1 hotfix
updating develop with hotfix versions to avoid merge conflicts
Merge branch 'hotfix/2.3.1' into develop
squashing hotfix/2.3.1' into develop
updating poms for development