Bug 2532: Fix potential NPE in Utils.listFiles

Change-Id: I09fbcb8eaa98ea52e1c0ad09adc083c7a471c9a1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Merge "Bug 2532: Fix potential NPE in Utils.listFiles"