Merge branch 'issue790' into 1.7.x
update emberjs and handlebars versions & fix failing unit tests
Merge branch 'issue793' into 2.0.x