VE-1511 Integrate new API for getting template suggestions
Merge in branch VE-525 and re-fix typo
VE-1511 Code review changes
VE-1511 Simplify deferred callback
VE-1511-two: Minor indentation
Merge pull request #4702 from Wikia/VE-1511-two

VE-1511 Integrate new API for getting template suggestions