jf-common: general cleanup/fixes

PS2: fix all merge conflicts

Signed-off-by: Jacob Whatley <jacob.whatley91@gmail.com>
Change-Id: Ic90a34e4f9962e9d88f89393e007431600098c2e