Refs #6877. Taking it back out for now.
Merge branch 'feature/6877_qtclucene_osx' into develop