* added expiry option to the stashFile() call, a future option User:Aaron_Schulz is adding

Change-Id: If4039d4cb113578d0ee1d2d7ec958243b87f0046
Merge branch 'php'