Add --binstubs and librarian-puppet