Revert "LPS-48581 Make it so an OSGi plugin can easily call the macro"
Revert "LPS-48581 Turn build-service into a macrodef, no logic changes"