SONARPLUGINS-2494 - fix branches of recursion check
+ organize imports