relicensing: flag some contributions in source code

so that we can easier follow where we still need to get
permissions for the relicense
relicense some of my own code under ASL 2.0
refactor shutdown

also relicensing some of my own code under ASL 2.0