Merged #129 "Eliminate Wicket references from non-Wicket packages"