CAMEL-6447: Fixed CBR not working correctly when being nested. Also fixed endChoice to work better when nested.

Conflicts:
	camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java