Fixed code analysis warnings
Model: Fixed duplicate specification of OS parameter
Feed Editor: Use "requires" and "restricts" naming consistently
Tweaked ConlictDataUtils file layout
ConflictException: Differentiate between new, inner and existing conflicts