LPS 50823

Hey Dale.

These two commits have to be sent to Trunk in order to solve the calender event import problem in LPS-50823.

Let me know if your have any concerns.

John.