Merge "Provide ability to configure keystone resync interval" into release/2019.2.0