HOTFIX 2017.1 - Changes were made to contact form code so that it will work with contact forms that use 'All Stores' instead of having the form for just one store