merge of https://github.com/spree/spree/pull/4153

* merge of pending spree core request
* when in doubt, took the latest rabl due to changes from 2-1 to master
* when in doubt, removed failing tests