Merge "Check that Account Parcel has name and type." into oc-dev