Updated checkstyle settings in line with develop (but ignoring the overly strict package naming convention change)
Added tera-ovr jar
Checkstyle fixes