enable use with encrypt 4

Patrick Kennyrequested to merge
issue/field_encrypt-3620774:encrypt4 into 4.x

Merge request reports