After merge, fix isRootAdmin() calls to use accountId instead of type
fix build for the juniper-contrail plugin