Use map instead of hacking path to our need.

might help closing #7034
Merge pull request #7035 from Carreau/use-map

Use require-js map instead of hacking path to our need.

closes #7034