Updated feature and core-criteria.
Merge branch 'working'

Conflicts:
	container-resources/bundles/opennms-model/src/main/java/org/opennms/netmgt/model/OnmsIpInterface.java
Getting there.
Getting there.
Rename stuff ;-)