merging trunk changes with IIS-CDH-5.3.0 branch
creating IIS-CDH-5.3.0 branch
#712 introducing plaintext caching