CONN-1082: Added license and missing Override annotations; fixed more formatting issues