RL-stories split to match storyboard stories, rename functional test
Merge remote-tracking branch 'origin/master'