Merge proposals dependent on lp://staging/~jonas-drange/js-oopsd/conditional-setuptools-import

1. conditional-setuptools-import
2. Dependent merge proposals