[rebase] fix lose estimated time of issue which start and due are same day and it is on Friday

This is rebase of #24