Merge pull request #2340 from niksite/devel

Fixed 'service'. Now it respect 'enabled=no' as well.