Fix issues in ONAP install scripts