Reset the order of Gerrit Options

Added PA and CM to the top.