BOM pom fixes

Change-Id: I3345a675c57c0d259a90e3b5732e08b10ec7f8cd