Merge changes I7410915a,Iede082f5

* changes:
  Improve fast-path in SimpleDateFormat.matchString()
  Improve test coverage for SimpleDateFormat