Fix builds when datasense is enabled. The icons where not created and the build was failing. Force creation at begiining of the process
Improve templates for metadata key and metadata key retriever