Attachments auto download in Spring 16? Workarounds?

With an HTML attachment on an opportunity the File Download servlet causes the file to download.  There’s a Setup option to control the behavior of file links you have to configure your org accordingly.