merge to release
Finished feature/ 37943079/test-story-auth

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