Merge "Update keystone default softparams" into release/2019.2.0