Merge "move motd_company_name|ssh_banner_company_name into defaults"