Achaturvedi/infr 393 getopt implementation

@vanchi-zendesk