Merge "reverting onu custom image to master"