Other conflicint gchanfe.
Finished feature/ 47625039/test-epic-story-1

PT-Story-URL: http://www.pivotaltracker.com/story/show/47625039
RB-Review-Request-URL: https://dev.salsitasoft.com/rb/r/4219/