(1) Fix the counter increment in lock support
(2) Fix the passing of local MR index.  Use the macro in case we change the
base of the user program start (NULL for now and everything works now).