Merge "[RICPLT-1528] xApp Mock improvements..." into PI3