reverted to apacheds  1.5.7
Merge remote-tracking branch 'origin/master'