Merge design updates - thanks to emjohson for providing these patches Conflicts: pom.xml src/main/webapp/jbi/components/servicemix-exec.conf src/main/webapp/users-guide/manual.conf src/main/webapp/users-guide/toc.ssp