[TASK] Remove PHP 5.4 from travis build of CMS 7
Merge pull request #711 from coding46/RemovePhp54ForCms7Build

[TASK] Remove PHP 5.4 from travis build of CMS 7
[DOC] Fix an incorrectly closed code citation in VH argument
[TASK] Apply deprecated wizardTab and icon if options not set

This patch will check if the `options` provided to `flux:form` already contain the `group` and/or `icon` options before attempting to set the options from the deprecated arguments `wizardTab` and `icon`.

References: #709, #686