Merge "Fix DateUtilsTest#testFormatMethods" into jb-dev