V2018.2.2

Sean Bailey

@sbailey

191bfa3d · more merge cleanup to match develop branch · Nov 14, 2018

updated hawkeye-specific code in prep for launch!