Fix issue with nil values.

When merging this hash if a nil value is set we should just use the
defaults.
Merge remote-tracking branch 'origin' into openstack