Remerge featuredatabase.xml, to address Bug 2049, plus remerge fixes for Bug 476, Bug 1895, Bug 2149, Bug 2049, Bug 2509 and Bug 2539
# b1a.var
EXTENDS A1
VARIANT B1A
BUILD_INCLUDE append epoc32\include\B1\build
BUILD_INCLUDE prepend /prepend/include/B1
ROM_INCLUDE prepend /epoc32/include/B1/rom
VARIANT_HRH \epoc32/include/e32cmn.inl