Merge branch 'master' of https://github.com/rackerlabs/repose
Merge branch 'master' of https://github.com/rackerlabs/repose
Configs, type
D-12940 adding configs for distdatastore defect
D-12940 config file changes for test
D-12940: Test that the DD service shuts down basis
D-12940 adding debugging capability in functional tests
Merge branch 'defect' of github.com:dmnjohns/repose into Defect
D-12940 adding dist ds to registry
D-12940: Registering ddservice
D-12940: removing extra spring beans, added null check on destroy
D-12940 reverting spring config changes, seeing NPE in logs on shutdown when not configuring distdatastore
D-12940 test to ensure dist datastore as filter shuts down
D-12940 adding spock to toplevel pom
Merge branch 'master' of git://github.com/rackerlabs/repose into defect
D-12940 fixing pom typo
D-12940 tests are still flaky
Merge branch 'defect' of github.com:dmnjohns/repose into defect

Conflicts:
	test/spock-functional-test/src/test/groovy/features/services/distdatastore/DistDataShutdownTest.groovy
Fixing merge issues
Merge branch 'master' of git://github.com/rackerlabs/repose into defect

Conflicts:
	project-set/core/core-lib/src/main/resources/spring/repose-core-context.xml
	test/spock-functional-test/pom.xml
	test/spock-functional-test/src/test/groovy/features/filters/apivalidator/ApiValidatorJMXTest.groovy
	test/spock-functional-test/src/test/groovy/framework/ReposeLauncher.groovy
	test/spock-functional-test/src/test/groovy/framework/ReposeValveLauncher.groovy