Modal tenure/qualifications fix
Fix for tenure completion UI
Merge branch 'develop'