License Changes
Merge halbuilder-jaxrs/master