Bjarocki/revert merges into master

- Why?
 - There was unnecessary merge upstream into our master branch
 - There were unnecessary merges related with supporting default_install_options
 - Both of those should not go into master as we're using dd_pip_list
- https://trello.com/c/wq6wAOtQ/257