Prevent null exception for weird case where setContentType() is invoked
with null argument.
Temporarily adding @Ignore back to test that currently only works when
run via Eclipse, and not via gradle.
Merge branch 'bundler-exploration' into test-source-module