Completed MULE-7333 adding support for new Database templates

Completed MULE-7333 adding support for new Database templates