r4692
!!BROKEN!! fix conflicts with rev4692
Merge branch 'master' of /space/vdist/red5-server-svn

Conflicts:
	pom.xml
	src/test/java/org/red5/server/net/rtmp/RTMPMinaTransportTest.java
	src/test/java/org/red5/server/scope/ScopeTest.java
	src/test/resources/logback-test.xml
r4695
fix xonflicts with r4695
stable jmx ports