I have the same exact situation for 2018, and I don't see that anyone ever responded to your post. Did you figure out how to handle it for your 2017 return??
