Engine, database, and hcl make files update
Merge branch 'manseur'

Fix Makefiles