Merge remote-tracking branch 'origin/feature/manual-component-registry'

Conflicts:
	src/server-java/app/nextapp/echo/app/util/PeerFactory.java