It looks like that did if for me. After the factory reset, I still had the problem. I didn't have Google Fit installed so nothing to do there but I did disable S Health and my battery drain appears to be gone. I'll report back if it seems to worsen again.
I have the same issue with the battery life on my S5 becoming terrible following the Lollipop upgrade and my prior battery life was one of the best parts of the phone. I have had a series of chats sessions with Samsung technical support and they refuse to acknowledge that there is a problem...