Merge "Keystone no longer uses paste-ini"