Merge branch 'develop' into blr

Conflicts:
	server/core/dcb.c
	server/modules/include/blr.h
	server/modules/routing/binlog/STATUS
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c

server/modules/routing/binlog/blr.c

@@ -200,6 +200,9 @@ int		i;
 	 *	user=
 	 *	password=
 	 *	master-id=
+	 *	filestem=
+	 *	lowwater=
+	 *	highwater=
 	 */
 	if (options)
 	{