Merge "Revert "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands""