Fix lock in lxsession-default and add lock_manager option in lxsession-default (fix #705)