Added server_id to my.cnf template logic

Change-Id: I82db1e97a366e7c54c2af09b0cba6e7c732562ef
Implements: blueprint modify-task-mgr-to-pass-a-server-id-to-mycnf-template
Update from global requirements

This removes d2to1 references, which is important.

Change-Id: I71f6df820d0c4596015acd2069f1650f29e07575
Merge "Update from global requirements"
Merge "Added server_id to my.cnf template logic"