Proxied Automock Support

For ctor and property injection with proxied mocks.  This means you can specify interceptors around the mocks, i.e. logging interceptor for mocks.
begin/end support

Now logging at debug level with start and end for each method resulting in nested message hierarchy, useful when looking at a text file.  Info level has the entire call logged in one line, useful for searching
merged conflict

keeping blacklist resolver