Rename and fix os-collect-config config template

This template was in the wrong path, and missing some parameters.

Change-Id: If8214cdb3597bc65f92e0e7a4fb8038342c39ae4
Merge "Rename and fix os-collect-config config template"