CBLT-252:  remove references to mavenLocal(), restore "build___WithArtifact" params

Change-Id: I6d408d29924f1a03b500b17892b2d5ecfd8dcc50