Fix performance degradation bug

- do NOT use cpsPath query for gettign individual CM Handles
- change order of queries for more efficency (property query first)

Issue-ID: CPS-1085
Change-Id: Ia3bdf4f0d245a2b128557352685d2aa17c1f939c
Signed-off-by: kissand <andras.zoltan.kiss@est.tech>
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
7 files changed