Maven build fixes

Change-Id: I1f05cc77bebc4fafc00caf93bfe9388af00767f8