This completes cleaning operation of r1821 by re-inserting non-STF455 specific changes in trunk

Reverting non STF455-specific changes trunk/javasrc (r1427 - r1432). 
Those changes:
 - have been manually duplicated in Security branch, causing massive conflicts upon merging the branch back in trunk. 
 - will be re-inserted by merging Security branch back in trunk (cf. next commit)