add EmptyTrash values and finish consolidating the CGP timezone arrays, RT#7083