Merge compiled addon/templates into addon/ JS tree.

This allows addon/templates to be properly available inside the my-addon-name.js file with the correct module name.

Closes #1967.