Merge pull request #154 from avinashcpandey/develop

AMP MergeSortByKey fix for 65535 tile limit issue + EPR 394528  394534
Fixed all compilation errors