Merge "Add options for development bindep install"