Removing dependency on Java 7
TYNSTEP-66 - Starting on this- will continue rest on a branch