Backport tempest change for https://bugs.launchpad.net/keystone/+bug/1334368
but check both 200 and 204 for compatibility with older installs of icehouse.

Change-Id: Ib7474ca2d7fc354aab3312d97ca6df3500c6f134