Merge "[RICPLT-2048] X2 ENDC Setup request refactoring - unit test added"