fixed s2MergeByTime bug, backwards compatible#11

EtienneKras wants to merge 2 commits intogee-community:maingee-community/ee-packages-py:mainfrom

EtienneKras:mainEtienneKras/ee-packages-py:mainCopy head branch name to clipboard