Remove unused  global. Closes #4694
get_subtotal_to_display docblock update. Closes #4693
Merge branch 'upstream-master'

Conflicts:
	includes/class-wc-order.php