removed obsolete import stmts in Java files. And ref local copies of windup-metadata dependency in pom files