Initial changes for Hudson - still an issue with JellyScriptContentTest