Allowing custom services to be used as encryptors

This allows full BC but allows a service ID to be specified in the configuration if the user wants to use a custom service (that implements EncryptorInterface).  This is useful when some advanced functionality is needed for the encryption, as it allows for the encryptors to make use of DI.