config/version: set version back to 'devel'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge remote-tracking branch 'upstream/openelec-4.2' into openelec-4.2
[aml] Add a patch for XBMC that fixes the issue when settings may be occasionally lost after a poweroff