RA-497: Turn Edit Patient Demographics and Edit Contact Info into extension points
convert edit contact info to extension point; fixes for edit patient demographics changes