Fix potential issue in ::convertUUIDs

$array argument may not be an array, and ::makeArray is used to
turn it into an array if it isn't already.
Later, however, when a UUID is discovered, it's replaced IN $array,
which may not actually be an array...

This could happen if $array argument if fed a UUID object.
For the loop, that object is converted to an array (will at that
point be a array( UUID )). a UUID will be discovered and attempted
to replace the value in $array, which is still just the UUID object.

Change-Id: I7e753b0ef5936f222af3463fc719044a3d2d0a4f
Merge "Fix potential issue in ::convertUUIDs"