checkin changes to build for cross version, sonatype