Fix for issue #4103

Fix for https://github.com/zendframework/zf2/issues/4103
fix copy/paste low skill :]
unit test for fix#4103

Test if the last char of the markup is '>' of '</select'>', and not the delimiter ':' that has to be removed if seconds are not shown.
Merge branch 'hotfix/4147'
CLose #4147
fixed substr
Merge pull request #4133 from mpalourdio/Fix#4103

Fix#4103
[#4133] fix test failure

- Default locale included ante/post meridiem marker, which select
  element was not taking into account, nor were tests, which left a
  dangling " a" following the markup, and hence a failing test. Updated
  code to strip such a format marker as well as trim the final markup.
[#4133] CS fixes
Merge branch 'hotfix/4133' into develop

Forward port #4133