Merge "Optionally tag classes with Maven artifact spec" into oc-mr1-dev