Merge "pvrsrvinit -> pvrsrvctl"