Merge "Further fixes for running ONAP Frankfurt"