Merge pull request #13 from zanata/update-parent-pom

Update Zanata parent
[maven-release-plugin] prepare release api-3.3.1
[maven-release-plugin] prepare for next development iteration
Merge diverged release branch with -s ours.

Release branch appears to have had a backported update, then had the
release plugin run to generate a tag and update version numbers.

I am merging it into master but discarding the version changes, so
that the release tag remains part of the direct history of the development
branch.

This is happening the day after a release was made. It should have been
done before, but there should be no harm in merging it now, it just means
the recent release node is not strictly an ancestor of the previous release.
The next release will be an ancestor of both.
Merge branch 'release' into integration/master