HOTFIX dict insert
HOTFIX dict insert

```yaml
dict:
  k1:
    k2: "string"
```

dict_insert(dict, some_dict_val, k1.k2)

Trying to insert a dict value to a place where none-dict value exists
would invoke dict merge with (none-dict, dict) input resulting in error.

Solution: only invoke dict_merge if both items are dict. otherwise,
overwrite none-dict value.

Change-Id: Idd6f95bb8c5a9bb0dbe297058da695145c584555

okolisny/InfraRed,okolisny/InfraRed,okolisny/InfraRed,redhat-openstack/infrared,redhat-openstack/infrared,redhat-openstack/infrared