MT#10339 fix 4.2.1 build

- update patches from upstream for 4.2, remove old ones from 4.1
- refresh sipwise patches
- don't apply sipwise patches that do not apply to 4.2.1 ( WIP )
- add extra-modules package

Change-Id: Ia23fe523585ed5dcf94e888ed02ebbfe5cb1a30a