Tweaking the merchant reference

Hopefully, this will better avoid collisions

Change-Id: I299e646fea5b9cc67e5ab35120bc5eaf9a66bc1f
Merge branch 'master' into deploy

Change-Id: I59ea78591f26d8dd7d059c54e00b5fa995127f85