incorporates django-icommons-ui v0.8.3 changes (TLT-499)