fix fallout from #22185 (#22601, #22600)
fix fallout from #22185 (#22601, #22600)
Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
	httemplate/view/cust_main/packages/contact.html