SPR 4.0.0.RELEASE and SI 4.0.0.M2 Compatibility

Updates to make spring-batch-integration compatible with these releases.