Added support for loading descriptors from files within a bundle. This
is used by the New Spring Wizard which contains template files within
the bundle.
Changed API visibility of template downloader as it is subclassed for
the New Spring Wizard.
Merge branch 'master' into spring-4-libs