Merged.

Sounds good to me. All code changes in the pull request look like
improvements/fixes to me.

I ran uncrustify 0.66.1 (the version in Ubuntu 18.04) on our codebase. The main changes are:
  
* uncrustify >= 0.65 changed the name of the option "align_number_left" to "align_number_right" 
* uncrustify 0.66.1 removes whitespace between ; and } in one-liner method definitions.
* uncrustify 0.66.1 adds whitespace between "friend std" and "::ostream".

The second change is ok or maybe even preferable since the behavior of uncrustify 0.61 is rather 
surprising for these one-liners. The third change is obviously a bug. Fortunately, this bug has 
been fixed in version 0.67. Therefore, I propose to switch to uncrustify 0.67. The following 
pull request shows the changes incurred by the switch.

https://bitbucket.org/jendrikseipp/downward/pull-requests/94

In a follow-up issue we might want to consider using the new option 
"indent_cpp_lambda_body=true" to make the indentation of lambda functions more intuitive.

In issue799 we came to the conclusion that switching to a newer uncrustify 
version is preferable to switching to clang-format. We would like to test whether 
uncrustify 0.66 fixes the shortcomings of uncrustify 0.61 and correctly formats 
C++11 code.