Remove import and whitespace.
Add _xxx to the zip file if already exists.
Temporary StringUtils import

gh-1671 was omitted due to a conflict. In order to
have the rest of the build passing, however, this
import must be present.
Remove hibernate import