code cleanup, converted to new com.veritiv package nomenclature
Merge remote-tracking branch 'upstream/master'