masterfiles indentation proposal

Each time I'm upgrading CFEngine, I merge the masterfiles updates into my files, and to ease the diff, I reindent the upstream masterfiles.
After doing it a bunch of times, I thought you might like those as they might make the files more readable.
I also cleaned up some trailing whitespace.

Most of the indentation ideas are coming from @zzamboni's awesome book.
No functional change have been made.