Fixed compile errors due to rebase with master (snapshot & restore)
Added unit test for HppcMaps#intersection