Resolve hardcoded package in persistence-ddl.xml and duplicated lines in
persistende.xml