ROBE-191 - Fixing pom and bundle skeleton