Additional changes to upgrade to Polymer 0.11.0

TBR

Realized some additional changes were needed after looking at 'grind deploy' output.

The deployed version doesn't launch: #2695. Fixing.