Duplicated package access rewriting.
Merge branch 'master' of github.com:plast-lab/DelphJ