The Disney canon reset was earlier this year, in fact it officially took effect on April 25th of 2014.
Anyways, the most recent editions of the film are "official canon." This means the 2011 blu-rays are now the official story of the events that took place a long time ago, etc. etc.