Merge 10.8 final to trunk#7895

spencertransier merged 4 commits intotrunkwoocommerce/woocommerce-ios:trunkfrom

merge/10.8-final-to-trunkwoocommerce/woocommerce-ios:merge/10.8-final-to-trunkCopy head branch name to clipboard