Moved code around, minor tweaks, now official BKCommonLib version for 1_5_R2

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>