add more logic to outstancing balance and order updater to set the correct payment_state on the order when the order is canceled.

Fixes #5106
Closes #5193
Use rspec-retry to get past random phantomjs failures (turn off by default)

Closes #5178

Conflicts:
	common_spree_dependencies.rb
fix ignore_types to work with FlashHash in rails 4.1
Fixes #5192
Add track_inventory to permitted attributes.
Only compute an amount no greater than the objects amount.
Compute amount based on remaining amount so that multiple promotion actions don't cause negative balance.
Fix AvailabilityValidator for saved records

Previously availability only considered inventory_units on the
target_shipment of a line_item. Since target_shipment is not persisted,
a saved line_item would become invalid when its variant ran out of
available inventory even if the inventory_units were already reserved.

Fixes #5208
Fix importing source with payment profiles.
Fix cc stub.
Merge branch '2-3-stable' into 2-3-nemo-stable