Merge "Switch common.retry around enforceState to 'retries' parameter" into release/2019.2.0