prepare brand name for image file - ticket #8013
small warning fix
remove meta keywords on product page - ticket #8030
merge customer locator fixes from dev
merge discount info module
remove ops link in account navigation
merge with accountnavlinks branch