Updated openstack/openstack
Project: openstack/keystone  20fc8152a2ba725484a63e96294b67ad1a89147d

make sample_data.sh account for the default options in keystone.conf

Closes-Bug: 1394816

Change-Id: Ifb19d09a1ed8e82aebcaea82783480176daa3536