adding variant support for unordered maps
Merge branch 'phoenix' of github.com:InvictusInnovations/fc into phoenix
fix coding standard violations