testing/supervisor: upgrade to 3.1.3, set maintainer, change to BSD license
main/supervisor: move from testing