Merge "Build vnf and restapi containers for ARM"