track jb-devel-release of cfx vendor
Merge branch 'jb-devel-release' into jb-devel-release-i9505

Conflicts:
	default.xml