Restore -i to mcservl invocation, add MCUSERDIR so mcservl can change working dir [1654]