Changing the timestamp CLI command
Merge branch 'master-shashank' of github.com:aristanetworks/neutron into master-shashank

Conflicts:
	neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py