Fixed recently introduced issue with XSL-FO screen/form rendering caused by change to the ScreenRenderImpl.makeUrlByType()
Merge remote-tracking branch 'upstream/master'