fix master build

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Move LockMasterListener initialization to system context

This reverts commit d178b25daa484dda44bb34e63cb719d1c3cc1519 and moves
the initialization to the system context, which really where it should have
been from the beginning.