Minor import reorganization
Updated maven-release-plugin