LPS-51555 use Java 7 multiple catch and diamond