Merge remote branch 'mainline/master'
Conflicts: usr/local/www/diag_smart.php usr/local/www/firewall_rules_edit.php usr/local/www/interfaces.php usr/local/www/load_balancer_pool_edit.php usr/local/www/pkg_mgr_settings.php
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php