ACCUMULO-3063 Ignore maven-plugin-plugin in m2e
Merge branch '1.6.1-SNAPSHOT'