Fix NPE in Jini Lookup Browser
Fix Ant startup scripts for Rio
Fix sorcer.env loading as a resource
After merge