Fixed code analysis warnings, created common code analysis dictionary
Use "services" instead of "locator" as shorthand for ServiceLocator