Minor cleanup of manifests and build scripts of IRB 120 and 4400 pkgs#26

Merged

Levi-Armstrong merged 2 commits intoros-industrial:groovy-develfrom gavanderhoorn:irb120_4400_minor_cleanups

Sep 15, 2015

Commits on Sep 5, 2015