Only string param in taxonomy_is_product_attribute

Conflicts:
	includes/wc-conditional-functions.php
Patched up docblock after faulty merge. Closes #4721
Merge remote-tracking branch 'upstream/master' into upstream-master