* Backport secrets encrypt rotation
* Backport integration fixes for custom etcd args
Signed-off-by: Derek Nola <derek.nola@suse.com>