Merge "Fix fat jar creation of certservice-client"