ENGINE-1639, move restart handle to be near works and update javadoc