Add an os-collect-config element.

Change-Id: I8b27678bb8495d10b355aa7f6370a4f86f6c957d
Merge "Add an os-collect-config element."