update some templates as in spree 2-2-stable branch
merge alepore/2-2-update into master for forward-porting