ignore
ignore2
ignore
WL-1834, KNL-1287, KNL-1235
Merge branch 'sakai-10.x' of ssh://github.com/ox-it/wl-sakai into sakai-10.x

* 'sakai-10.x' of ssh://github.com/ox-it/wl-sakai:
  New release 10-ox1-alpha6
  WL-3478
  WL-3416(KNL-1235) WL-3513(KNL-1287)