chore(pd-store): cherry-pick commits from master for synchronization & some modifications for passing partial hstore tests

chore(pd-store): cherry-pick commits from master for synchronization & some modifications for passing partial hstore tests #1055