relicense some of my own code under ASL 2.0
cleanup
relicense

own code + contribs from Red Hat, for which permision
to relicense exists (email 2014-05-27).
cleanup