converting master to 8.5
TEIID-2528 adding an encrypted file option