Fix for BISERVER-8185 and addition of build_dev.xml