Resolves COHINC-1: Add support for Java 7 (http://java.net/jira/browse/COHINC-1)