Admin - Changing display of login expiry notices

With the introduced config options "PA-DSS Admin Session Timeout Enforced?" and "PA-DSS Strong Password Rules Enforced?" the login expiry notices in admin section is kind of confusing, when Non-Compliant is chosen.

Not sure though, that this is the best way to solve it, so feel free to comment and propose a better way/coding.

What it does:
- Displays the notices as today if in compliant mode. E.g. logout after 15 min etc.
- If "PA-DSS Admin Session Timeout Enforced? = Non-Compliant" it displays the same text, but with chosen session time (Admin Session Time Out in Seconds rounded to minutes).
- If "PA-DSS Strong Password Rules Enforced? = Non-Compliant" the notice for password change is hidden.

One ting I'm unsure about is what's happening if "PA-DSS Admin Session Timeout Enforced? = Yes", will the setting for "Admin Session Time Out in Seconds" still apply if it's set to 15 minutes or less, or is it 15 minutes anyway? Since it's now a "text field", and not a radio list.