Merge branch 'develop' into solaris-smf-fmri
smf.py: use FMRI instead of SVC in Solaris svcs commands
Merge remote-tracking branch 'upstream/develop' into solaris-smf-fmri
Merge pull request #14156 from YanChii/solaris-smf-fmri

smf.py: use FMRI instead of SVC in Solaris svcs commands