ant: Set SOURCE_BRANCH and OMERO_RELEASE using omero.shortversion
travis: Hardcode version for ant testing
Allow zero-length environment variables
Merge pull request #750 from rleigh-dundee/ant-props

ant: Set SOURCE_BRANCH and OMERO_RELEASE using omero.shortversion
Merge remote-tracking branch 'origin/develop' into ant-apisupport

Conflicts:
	common/rules.xml