Fix for BISERVER-8185 and build_dev.xml additions