Storefront: default_html5. shipping estimate form bugfixes
Merge remote-tracking branch 'origin/1.1.5' into 1.1.5