Harleigh108: Changes to MCT such that MCT can be built (successfully with Maven on the command line) with respect to Java 6 or Java 7