Merge from master:  Fixed incorrect logic for testing storefront.lazyLoad init parameter