Reverted changes to IDictionary instances in favour of modification to SwaggerSerializerStrategy.
Merged upstream changes from dictionary-serialization branch.