Merge "Tempest config options for security compliance" into release/2019.2.0