Travis multiple blank line cleanup and if block code consolidation

[kellyselden]

I had Travis file cleanup in #7066 that was closed. This takes the good cleanup without the firefox stuff.

[Turbo87]

hmm... are those files not checked by any tests?

[stefanpenner]

Likely not a bad idea to load them via yml parser and ensure the internal state is as expected

[Turbo87]

Likely not a bad idea to load them via yml parser and ensure the internal state is as expected

sounds nice in theory, but might be overkill for what we're doing here 🤔

[stefanpenner]

@Turbo87 future PR is fine

[kellyselden]

I though about fixtures to test these files too. I think I will add them. It's so easy to regress the formatting in these files that I think it will be worth it.