Initial patch from SPF11.3.CSU1 to SPF11.4.CS

This is the result of applying the diff from SPF11.3.CSU1
(r11.3_00005.2) and SPF11.4.CS (r11.4_00001.2).

The rejects will be fixed in later commits

Change-Id: I22d92814b0ea617e4cb693eafa40f208081d729f
34 files changed