Remove trailing whitespace. Refs #1704.
Merge changes from the master branch to remove trailing whitespace. Refs #1704. http://redmine.named-data.net/issues/1704
Recompile after merging from master to remove trailing whitespace. Refs #1704.