Merge branch 'irinabron/encryptor_decryptor_patch' into 'master'

Add patch for activerecord encryptor

See merge request !287



Merged-by: Leonardo da Rosa <ldarosa@gitlab.com>
Approved-by: Leonardo da Rosa <ldarosa@gitlab.com>
Co-authored-by: Irina Bronipolsky <ibronipolsky@gitlab.com>