Cucumber style updates

* Sort tags alphabetically
* Indent And and But steps

Change-Id: I6274a91245f6a29d23ab0da5dc70f589379c88b4