Avoid forcing engine_conf to a dict

It is valid to provide engine_conf that is None and
when a engine is loaded it will notice that it is None
and load its default configuration.

Change-Id: Icde7ac85921f3b434cee39a9dfe7de997f2120bf
Merge "Avoid forcing engine_conf to a dict"