Remove currency helper from price facet
Use currency and value for old price
Merge branch 'master' into stable