Merge "EDGEPOD-147 Add Intel Hillsboro Edge to Aether cluster"