Merge branch 'release/6.1' into develop

* release/6.1:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release flexmojos-6.1