TIMOB-14504 Fix argument wrangling in close and give proper arguments in _restart
TIMOB-14504: Use older style declaration.
Merge pull request #4483 from BlainHamon/timob-14504_3_1_X

TIMOB-14504-3_1_X Fix argument wrangling in close and give proper arguments in _restart