NEXUS-7518-component-id-service

This is a copy of the NEXUS-7518-component-id-service branch, but based on master.