[batman] bump revision / handle multiple HNA / deal with DEVELOPER=1 properly