Merge branch 'master' of https://github.com/rackerlabs/repose into dimitry
fix jmeter tests for keystone
Modified JMX test to test B-45090
Merge branch 'dimitry' of https://github.com/rackerlabs/repose into dimitry

New commit for sprint 38
Merge branch 'master' of https://github.com/rackerlabs/repose into dimitry

Conflicts:
	test/jmeter-automation/src/test/jmeter/Power API - Client-Auth-N - Keystone 2.0 Tests.jmx
	test/jmeter-automation/src/test/jmeter/Repose_Client_Auth_Keystone.jmx
updated JMX test
merging from master
Added Compression filter tests for jmeter
Added deproxy tests for compression filter and deflated.file
Merge branch 'master' of https://github.com/rackerlabs/repose into dimitry

sync branches
Merge branch 'dimitry' of https://github.com/rackerlabs/repose into compression-testing
Added check to abort response compression when filter is configured to ignore content-type
Updated compression filter configuration to allow any content-type to be configured in include/exclude
removed unused complex types in compression configuration xsd
added safer checking of include/exclude excluxivity for user-agen and content-type within the compression filter configuration
Moved data_files for compression tests to test root folder. This was due to the data files needing to be on the box which will run the jmeter tests and not the regression boxes themselves
Moved data files to root of maven jmeter directory so as to access their file paths within jmeter tests
passed jmeter root directory to Repose_Compression jmeter test