Travis CI integration: fixes for rebase errors.

Some of my previous changes got lost in a rebase.  This
patch reapplies them.  These are mostly formatting issues
rather than real problems, although I did manage to
lose some changes.

Jira issue: WP-793