Merge Tika 1.2 into tika-gv:
Merge commit 'ed2dc282d3750d18ada402c6a32dd275009100c9' into tika-gv

Conflicts:
	.gitignore
	pom.xml
	tika-app/pom.xml
	tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
	tika-bundle/pom.xml
	tika-core/pom.xml
	tika-parent/pom.xml
	tika-parsers/pom.xml
	tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/MetadataExtractor.java
	tika-server/pom.xml
Update to version 1.2-2