prepare for next development iteration
Merge branch 'release' into integration/master
Merge branch 'release' into integration/master
Update zanata-parent
Revert "Update zanata-parent"

This reverts commit 6429617e54661be401514164ab7b39d314e0cbe3.
Replace findbugs:jsr305 with findbugs:annotations; update parent
Add a parameter to ShortString shorten.

This is a patch to enable configuration of the length of the
resulting string in shorten.
Merge pull request #6 from zanata/configureshorten

Add a parameter to ShortString shorten.
Remove dependency on jaxb-impl
Update api
Merge branch 'release'

This merge is done to ensure that release can be brought up-to-date with
master as a fast-forward-only merge, in preparation for release.

Using merge strategy 'ours' to prevent version changes in release
overwriting the correct versions in master.
Use lastest parent and api versions.

Use parent 20, api 3.4.0