SSP-2529 Fix test compilation for JDK 1.7