Merge branch 'feat/preserve-masked-value-for-encrypted-fields' of https://github.com/splunk/addonfactory-ucc-generator into feat/preserve-masked-value-for-encrypted-fields

Author: hetangmodi-crest