Updating and adding tests for expiration timezone issues

Change-Id: Ie280ece4289d821d69add09e0c915f9953c520f1
Merge branch 'cloudkeep_working_smoketests' into cloudkeep_jenkins