PHP Notice cleanup
Changed product template to use 'variant' not 'variation' tags
Fixed #3077 Use new form error data for required add-on validation
Merge branch 'issue/3077' into 1.3.x