fixing bug #4220
fixing bug #4219
bug #4231 :  By setting the month before the day of month, when we are at the end of a month with 31 days and we want pass to the next month, instead we pass to two month after. In order to fix this bug, the day of month is set before setting the other date properties (month and year)
Merge branch 'master' into feature-4149