Merge remote branch 'mainline/master'
Conflicts: usr/local/www/carp_status.php usr/local/www/diag_nanobsd.php usr/local/www/services_captiveportal_ip_edit.php
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/carp_status.php
usr/local/www/diag_nanobsd.php
usr/local/www/services_captiveportal_ip_edit.php