Improve readability of long JQ expression

Inline single value from cidr.json.

Line everything up.

Unify expressions doing similar things.

Co-Author: Alexis Lee <alexisl@hp.com>
Change-Id: I41cfd0e5dfdf583492a65e3684bb812c0792084a
Merge "Improve readability of long JQ expression"