merge prep
take 2
recent updates including refactor of search and ct, and housekeeping items
Merge branch 'KTSSTG' of https://github.com/ktsWeb/magento into KTSSTG
fix: diff issue that was pushing through to stg