Update from vaaclipse-p2 branch