[FABRIC-937] Fix dependencies for compilation under JDK6