Merge "Use timeout consts in all ConnService tests"