PROV-526 Fix display template processing issues
Merge branch 'master' of github.com:collectiveaccess/providence