TMDM-7267 Fix JDK6 compilation

(cherry picked from commit d520d9b7e23977340bf8e6e94eea14fe75c34483)