Merge topic 'refactor-CPack-GetOption-returns-cmProp'

202a65759b cmCPackGenerator::GetOption returns cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6506