archiva: lint fixes

Change-Id: Ife91b591b7caab18e3c3d0deb3ba0dca4b437307
Merge "archiva: lint fixes" into production