buildman environment fix binman FMAP improvements minor test improvements and fixes minor dm improvements