Merge branch 'release/1.1.16' into develop
foundrycache template tag was using wrong class to compute key.
Prep for release
Merge branch 'release/1.1.16.1'