R1_0_10: make it work with CUs not on classpath and retain 3.1 compatibility
3 files changed