Added option to use shortname or not for options
Version bumped from 7.x-2.0-rc5 to 7.x-2.0-rc6
Merge branch 'release-7.x-2.0-rc6'