Looks like your fix resolved this particular issue. There are some other dependency issues I have yet to resolve (going from 17.1 to 17.2), but I think those are a separate issue with needing to add additional dependencies using the BuildUtils. I'm about to head out for a couple weeks so full testing will be a bit out, so I'll post here again if it turns out there's more.

Thanks again for the resolution and committing the change!