Backport from 2.0
Backport from 2.0

git-svn-id: fd89858969a22119b2795805526b04428387f7c4@461913 13f79535-47bb-0310-9956-ffa450edef68

zwsong/wicket,bitstorm/wicket,martin-g/wicket-osgi,freiheit-com/wicket,Servoy/wicket,mosoft521/wicket,apache/wicket,mosoft521/wicket,mafulafunk/wicket,freiheit-com/wicket,aldaris/wicket,zwsong/wicket,selckin/wicket,AlienQueen/wicket,martin-g/wicket-osgi,dashorst/wicket,AlienQueen/wicket,Servoy/wicket,zwsong/wicket,bitstorm/wicket,klopfdreh/wicket,astrapi69/wicket,zwsong/wicket,apache/wicket,dashorst/wicket,apache/wicket,mosoft521/wicket,topicusonderwijs/wicket,dashorst/wicket,AlienQueen/wicket,astrapi69/wicket,AlienQueen/wicket,freiheit-com/wicket,aldaris/wicket,AlienQueen/wicket,selckin/wicket,mosoft521/wicket,mafulafunk/wicket,klopfdreh/wicket,apache/wicket,selckin/wicket,klopfdreh/wicket,aldaris/wicket,dashorst/wicket,topicusonderwijs/wicket,selckin/wicket,klopfdreh/wicket,astrapi69/wicket,aldaris/wicket,selckin/wicket,aldaris/wicket,bitstorm/wicket,martin-g/wicket-osgi,Servoy/wicket,mafulafunk/wicket,dashorst/wicket,freiheit-com/wicket,topicusonderwijs/wicket,bitstorm/wicket,mosoft521/wicket,astrapi69/wicket,Servoy/wicket,bitstorm/wicket,topicusonderwijs/wicket,Servoy/wicket,freiheit-com/wicket,apache/wicket,klopfdreh/wicket,topicusonderwijs/wicket