Allow FreeShip promo to applied to an order

Fixes #3308
Fixes #3150
Fixes #3263

Conflicts:
	core/app/models/spree/adjustment.rb
	core/spec/models/adjustment_spec.rb