Merge changes I41dcf8aa,Ie13e1df6

* changes:
  Test for the existence of maps as well as programs.
  Minor simplifications in bpf_existence_test.