Merge "New apn overwrites existing apn, when created with same name but different apn type"