Additional fixes to work with Spree 2.1
Restore address form in the original concept