JBIDE-16375: Example discovery

Conflicts:

	jbdevstudio/com.jboss.jbds.central.discovery/plugin.xml
JBIDE-17254: Luna M7