WICKET-4932: code cleanup
WICKET-4932: fixing callback url expectations in bookmarkable pages