merging sfcoy fixes on ejb-over-http subsystem