Bug [3599194]: compat/fake-rfc2553.c is broken
merge trunk. 
Comment improvements, styling.