using full spring configuration to run these integration tests
Merge remote-tracking branch 'origin/master'