Updated from global requirements

Change-Id: I09953c528035bf4789313580c6e151b4638de898
Allow using non-default collectors

The local collector is not in DEFAULT_COLLECTORS, but should be usable
explicitly. It, however, suffers from a bug where only
DEFAULT_COLLECTORS are allowed through.

Change-Id: Ia42d1acd39638b448e2e2bfa26aff1c7ae415b71