Merged r553210 from 2.0.x: Refactored createArtifact methods to createArtifactSpec to make way for some real createArtifact methods.