Epic sample manifest updates

Includes branches for:
https://www.pivotaltracker.com/story/show/56277300
https://www.pivotaltracker.com/story/show/56277320