Fixes cyclic reference error in Organization -> Application -> Organization
Fixes more cyclic references in scan and application.
Removes cyclic reference for WAFs too.
Merge branch '2.1M2' into qa