Target frappe v15 and v16 on the stable line

Re-targeted main-hotfix at frappe v15/v16 instead of v17-only pins inherited from develop.