[ros-diffs] [gschneider] 42417: -Merge license change from AMD64 branch (r42414) -Adjust the return value of mktime by the chosen timezone after normalizing