fixing cucumber syntax
Merge branch 'master' into fs_packages