Revert "Merge branch 'master' of https://github.com/Tesora/tesora-trove into CE-1.2"

This reverts commit 1a7b15aa09702ab37f683e1d15a9e49739a3945a, reversing
changes made to 01ef84ada3a790e931f1592b9f4aa5359232d26d.