Comment 14 for bug 1687593

The functional tests that we added to verify this fix are being run against the stable branches, causing them to break because neither stable/ocata or stable/newton have the fix posted here. This was found and reported in https://bugs.launchpad.net/keystone/+bug/1704148.