[releng] backporting several bugs and formatting
[releng] backporting several bugs and formatting
[releng] backporting several bugs and formatting