Fixing typo in template, BAU-125

License update
Minor refactor and bug fix for BAU-129, display names are now correctly handled for uniqueness on user import
Adding a bit of color to bad rows, BAU-124
Adding ordering to the user profile list, BAU-124
License update
Help text improvements, BAU-124
Improving error handling around the freemarker templates.  BAU-124
Required UI tweaks
Merge remote-tracking branch 'origin/dev-BAU-124' into release/2.9.18rc
finally getting admin right for 2.9.18
A fix for the struts 0 day bug, BAU-184
Merge remote-tracking branch 'origin/dev-BAU-184' into release/2.9.18rc