Signed-off-by: Sean Busbey <busbey@apache.org> Conflicts: hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm pom.xml
Signed-off-by: Sean Busbey <busbey@apache.org> Conflicts: hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm pom.xml