Merge "Fix with using oslo_serialization base64 module"