Merge remote branch 'origin/master' into seam230final

Conflicts:
	pom.xml
	zanata-model/src/main/java/org/zanata/model/HDocument.java
	zanata-model/src/main/java/org/zanata/model/HProject.java
	zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
	zanata-model/src/main/java/org/zanata/model/HTextFlow.java
	zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
	zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
	zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRawRestITCase.java
Add dependency exclusion on okapi libs.

There is a build-log4j dependency on the okapi libs that causes a conflict with EAP 6's libraries.
Take new content states into account when preparing stats.