Merge "Teach ApfGenerator about the new opcodes for accessing data memory" into pi-dev