Merge pull request #4263 from DavidANeil:davidneil-improve-import-dia… #6154

Job	Run time
Tag Release Version ID	6s
Build and Test	27m 31s
Make Sure closure-compiler-npm is Compatible with this Compiler Build	1m 32s
Deploy Snapshot Bundles to Sonatype	-1s
	29m 8s

Provide feedback