[Fixes #3770] Use 2-1-stable branch of spree_auth_devise when generating sandbox
Merge remote-tracking branch 'upstream/2-1-stable' into 2-1-stable