PAYARA-3131 Clicking Cancel button on Configuration Properties page causes an error

appserver/admingui/common/src/main/resources/appServer/serverInstDomainProps.jsf

@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2017-2018] [Payara Foundation and/or its affiliates]
 -->
 
 <!initPage
@@ -60,6 +60,7 @@
             setPageSessionAttribute(key="selfUrl", value="#{sessionScope.REST_URL}");
             gf.restRequest(endpoint="#{sessionScope.REST_URL}/property", method="GET", result="#{requestScope.propTable}");
             setPageSessionAttribute(key="tableList", value="#{requestScope.propTable.data.extraProperties.properties}");
+            setPageSessionAttribute(key="showCancelButton", value="#{false}");
         />
     </event>
     <sun:form id="propertyForm">

appserver/admingui/common/src/main/resources/applications/appProperties.jsf

@@ -38,7 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
-    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
+    Portions Copyright [2017-2018] [Payara Foundation and/or its affiliates]
 -->
 
 <!initPage
@@ -62,6 +62,7 @@
             setPageSessionAttribute(key="selfUrl", value="#{sessionScope.REST_URL}/applications/application/#{pageSession.encodedAppName}");
             gf.restRequest(endpoint="#{sessionScope.REST_URL}/applications/application/#{pageSession.encodedAppName}/property", method="GET", result="#{requestScope.propTable}");
             setPageSessionAttribute(key="tableList", value="#{requestScope.propTable.data.extraProperties.properties}");
+            setPageSessionAttribute(key="showCancelButton", value="#{false}");
         />
     </event>
     <sun:form id="propertyForm">

appserver/admingui/common/src/main/resources/org/glassfish/common/admingui/Strings.properties

@@ -723,7 +723,7 @@ appClientLaunch.argHelp=Arguments to append to the URL for launching the applica
 domain.DomainAttrsPageTitle=Domain Attributes
 domain.DomainAttrsPageTitleHelp=Specify default attributes to use for the domain when custom attributes are not specified for a component.
 domain.DomainPropsPageTitle=Domain Configuration Properties
-domain.DomainPropsPageTitleHelp=Configuration Properties<br/>Sets property overrides at the domain level.<br/>Set Property name to the property key and value to the property value. Description can be used for your own reference<br/><b>Note:</b> For use with microprofile config api properties should be prefixed with <emphasis>payara.microprofile.</emphasis>
+domain.DomainPropsPageTitleHelp=Configuration Properties<br/>Sets property overrides at the domain level. <br/>Set Property name to the property key and value to the property value. Description can be used for your own reference. <br/><b>Note:</b> For use with microprofile config api properties should be prefixed with <emphasis>payara.microprofile.</emphasis>
 domain.AppsConfigPageTitle=Applications Configuration
 domain.AppsConfigPageHelp=Enable reloading so that changes to deployed applications are detected and the modified classes reloaded. Also enable and configure automatic deployment of applications. Click Add Property to specify additional settings.
 domain.Reload=Reload:
@@ -899,14 +899,14 @@ log.error.dateFormat=Exception in getFormattedDateTime().
 rest.invalid_method=An unsupported or invalid HTTP method was specified: {0}
 
 ## Microprofile Config Strings
-microprofile.properties.description=Configuration Properties<br/>Sets property overrides at the server/instance level.<br/>Set Property name to the property key and value to the property value. Description can be used for your own reference<br/><b>Note:</b> For use with microprofile config api properties should be prefixed with <emphasis>payara.microprofile.</emphasis>
+microprofile.properties.description=Configuration Properties<br/>Sets property overrides at the server/instance level. <br/>Set Property name to the property key and value to the property value. Description can be used for your own reference. <br/><b>Note:</b> For use with microprofile config api properties should be prefixed with <emphasis>payara.microprofile.</emphasis>
 headings.DomainProperties=Configuration Properties
 headings.DomainPropertiesTab=Configuration Properties Tab
 headings.ApplicationProperties=Configuration Properties
 headings.ApplicationPropertiesTab=Configuration Properties Tab
 
 applications.ApplicationPropsPageTitle=Application Configuration Properties
-applications.ApplicationPropsPageTitleHelp=Configuration Properties<br/>Sets property overrides at the application level.<br/>Set Property name to the property key and value to the property value. Description can be used for your own reference<br/><b>Note:</b> For use with microprofile config api properties should be prefixed with <emphasis>payara.microprofile.</emphasis>
+applications.ApplicationPropsPageTitleHelp=Configuration Properties<br/>Sets property overrides at the application level. <br/>Set Property name to the property key and value to the property value. Description can be used for your own reference. <br/><b>Note:</b> For use with microprofile config api properties should be prefixed with <emphasis>payara.microprofile.</emphasis>
 
 ##Payara Notification Logging
 log.NotificationLogging=Notification Logging