Fix for defaultValue serialization and collection changed bugs.

+ grunt file cleanup