Merge "Increase heap space for ccsdk/features jobs"