DEVFORUM-110: Apply changes to contentimporter project\