(cherry picked from commit c6f4bbfa)

Conflicts:
	sc/source/core/data/bcaslot.cxx

Change-Id: I774235d445192833031f99211639f23116e37bb4