Make getting the fileclient a bit more robust and remove unused PILLAR
variable.
Merge pull request #3588 from kjkuan/fix_getting_file_client

Make getting the fileclient a bit more robust and remove unused PILLAR var.