Add upstream apparmor fix for 14.04
Add mkimage-* patch that covers all mkimage scripts