Feature 11034: Forgot Password in OSM

	- Added support for forgot password from UI
	- Added forgot password button in login page

Change-Id: I058a09356c4e2ff5d5b0e883e74f0041d1aaffea
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
diff --git a/src/services/RestService.ts b/src/services/RestService.ts
index 5f47fb1..e333627 100644
--- a/src/services/RestService.ts
+++ b/src/services/RestService.ts
@@ -157,6 +157,9 @@
         } else if (err.error.status === HttpStatus.CONFLICT) {
             this.notifierService.notify('error', err.error.detail !== undefined ?
                 err.error.detail : this.translateService.instant('HTTPERROR.409'));
+            if (sessionStorage.getItem('usertype') !== 'change_password') {
+                this.activeModal.dismissAll();
+            }
             this.activeModal.dismissAll();
         } else if (err.error.status === HttpStatus.INTERNAL_SERVER_ERROR) {
             this.notifierService.notify('error', err.error.detail !== undefined ?