BZ-1007456: Upgrading to errai 2.4.0.Final