Revert "Revert "CA #204 Stay signed in as self after updating different user""

This reverts commit 373de4de6bfea3e0957d30545f657dfcb6b11759.
Revert "Revert "Revert "CA #204 Stay signed in as self after updating different user"""

This reverts commit b25cc943fb9c9066c91220777d8f363285af62f2.
Revert "Revert "CA #204 Stay signed in as self after updating different user""

This reverts commit 373de4de6bfea3e0957d30545f657dfcb6b11759.
Revert "Revert "Revert "CA #204 Stay signed in as self after updating different user"""

This reverts commit 487d1a030bbd0468d7a6fd1a0aa4ba96d788d0e9.
Revert "Revert "Revert "Revert "CA #204 Stay signed in as self after updating different user""""

This reverts commit 4d9f54b69857298a5886d0ee7a9e19ce24c68177.
Revert "Revert "Revert "CA #204 Stay signed in as self after updating different user"""

This reverts commit b25cc943fb9c9066c91220777d8f363285af62f2.
Revert "Revert "CA #204 Stay signed in as self after updating different user""

This reverts commit 373de4de6bfea3e0957d30545f657dfcb6b11759.
Revert "Revert "CA/NH #207 Save Feedback on New Feedback redirects to Edit instead of Show""

This reverts commit 0ce8273cb6166491b9b71ac8cb1840869000b372.
Resolve merge conflict README