Fix version in pom. Fix addon6 reference in manifest (#15158)

Change-Id: I7377c52d99b8e7e0c1b84666b9e09ca08d7b0d26