replaced random test on scheduler by unit test
Merge branch '6.3.x' into 'BS-1614_Pagination_And_Order_For_Service_Methods'