adding a comment to make a test easier to understand
adding a temporary fix to the NPE in import utility until it is converted to use the model properly
Merge branch 'develop' into fixing-jsp-support