Merge "Test for forcing Gregorian as default Calendar"