Updates to build system from FIPS branch. Make fipscanisterbuild work and