Allow removing keys from clone_options by setting value to nil

https://bugzilla.redhat.com/show_bug.cgi?id=1160342