Update changelog
xpd: Patched version number
'Release: 6.0.2alpha0'
Merge branch 'master' into avnu_testing

Conflicts:
	app_avb_lc_demo/src/aem_entity_strings.h.in