Ladas, This is a 5.4.z backport of the SSL bug you're already working on. Since you didn't have to add any new fields to support this, it's possible you could backport to 5.4.z without any issues. Let's talk about it to make sure it makes sense.
The backport should be possible, but it will be painful. There will be a lot of conflicts in UI, controllers and models I assume. But if we need it we can do it. :-)