[2.0][DDC-395] Applied the provided patch of Jordi Boggiano removing some trailing whitespaces and fixing missing public keywords