GUACAMOLE-625: Merge changes correcting failing build due to trailing whitespace in Makefile.am.