Expiration time should not be changed after TTL updates & code refactorings
Merge pull request #3935 from ahmetmircik/fix/3.3.3/expiryTTL

Fixes expiration time changes after TTL updates