Merge remote-tracking branch 'XTUPLE/billing' into 21587

diff --cc enyo-client/application/source/en/strings.js
Simple merge

diff --cc enyo-client/application/source/views/workspace.js
Simple merge

diff --cc enyo-client/extensions/source/billing/client/postbooks.js
Simple merge

diff --cc lib/tools/source/en/strings.js
Simple merge

diff --cc lib/tools/source/error.js
Simple merge