Move buildslave.py into buildbot.buildslave
Move openstackbuildslave.py into buildbot.buildslave.openstack