Use the bundled key generator only if necessary

Since Spring 4.0.3 includes the fix for the bug that the custom key generator works around, and the custom key generator is identical to the one in Spring 4.0.3, just use the Spring 4.0.3 one if possible.