Merge branch '1.4'

Conflicts:
	client/pom.xml
	client/zanata-adapter-properties/pom.xml
	client/zanata-adapter-xliff/pom.xml
	client/zanata-client-ant-po/pom.xml
	client/zanata-client-ant-properties/pom.xml
	client/zanata-client-commands/pom.xml
	client/zanata-maven-plugin/pom.xml
	common/pom.xml
	common/zanata-adapter-po/pom.xml
	common/zanata-common-api/pom.xml
	common/zanata-common-util/pom.xml
	common/zanata-rest-client/pom.xml
	pom.xml
	server/pom.xml
	server/zanata-model/pom.xml
	server/zanata-war/pom.xml
	zanata-parent/pom.xml