Previous fix in the setup keystone script was not enough.

Change-Id: I7b30fd4a481230b20a53e6ea6500928d3241581b