EDIT

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

Merge branch 'hotfix/3.6.1'

updating poms for branch'hotfix/3.6.1' with non-snapshot versions

version updates for 3.6.1

updating poms for branch '3.6.1' with snapshot versions

fixing classpath config

fixing classpath config

Release 3.6.0 merge