Nova compute config was separated

-adding config template to the merge list, as
 it was separated form original source template

Change-Id: Ib50afcc8538a6022c3e281e77ff435cbdc5ec4a9
Merge "Nova compute config was separated"