Loosen friendly_id restriction.
Fix recalculating included tax adjustments. Fixes #4671

Conflicts:
	core/app/models/spree/line_item.rb