Resolve Java 1.6 generics compilation issue
Merge pull request #15 from ggear/graham-patch-CDH-11359

Resolve Java 1.6 generics compilation issue