Comment 16 for bug 1614400

@Rabi, I tried to cherry pick your commit https://git.openstack.org/cgit/openstack/heat/commit/?id=1bb21c5bb3e1612cf4478465c1aa5a022b45f983 to stable/mitaka, but I found that there is some conflict due to commit e0e92b9d6de8a2900a5faf07c4c9c86404db5601 in stable/mitaka. Would you mind rebasing/submitting it to stable/mitaka? Thanks!