Pick up manifest fixes from master (#13684, #13799, #13839)

Changed picked up from master, reviews:
https://dev.vaadin.com/review/#/c/3299/
https://dev.vaadin.com/review/#/c/3560/

Change-Id: Id1e663df8f6a36f60d909399fdb9e2a095766cab