Update from the main RHQ project source