[ALOY-1146] merge date picker values correctly
Merge pull request #572 from skypanther/ALOY-1146

[ALOY-1146] merge date picker values correctly (1_5_X)