GUACAMOLE-656: Merge maven-surefire-plugin build fix.