Merge "Change functest branch to stable/brahmaputra"