Remove extra whitespace

Cleanup extraneous whitespace like end of line whitespace or whitespace
before </para>.

Change-Id: I83a26dae9f6f7e9af522c2418d64c2efae9d61f1