Make last try to avoid possible latency (UPDATED)

Get rid of Listener actor and shutdown the system from Master directly