Merge changes necessary for asterix-experiments pkg Change-Id: I1256608bbb97d747747325c2050d5a2dc89beeb0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/641 Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Ian Maxon <imaxon@apache.org>