SOC-3599 Test failure at ActivityStorageImplTestCase.testActivityOrderByPostedTime
Merge commit '1fd467bc86f87b3f4d2cdceefb4f8053ed687591' into HEAD