The fix in Heat that triggered this was backported to OSP8 (bug 1428845), so this fix also needs to be backported to OSP8.
Created attachment 1362165 [details] patch
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHBA-2017:3468