base

Fix issue #7213113: Remove old intent resolver

Also make the query package restart broadcast protected like the
documentation says it should be.

Change-Id: I445166111318a02f2f2b1ab0dff9c641a441c20b