I can confirm that workaround in #12 works for me on upgrading a macbook pro early 2015 from 15.04 to 15.10.
I can confirm that workaround in #12 works for me on upgrading a macbook pro early 2015 from 15.04 to 15.10.