Merge remote-tracking branch 'caf/LNX.LA.2.7.4' into HEAD

Conflicts:
	fs/proc/task_mmu.c

Change-Id: I5a7ea47f528f88a9fdc7e4e2ec805b0b827cc1e3