changing expectedUpdateTimeoutMargin setting from 10 to 20