England have made two changes to their squad for Saturday's World Cup quarter-final against France with Josh Charnley and James Roby returning.