Merge branch 'jboss_4_and_5_download' into devel