Fix include order for cpplint#158

jacobperron merged 2 commits intomasterros2/rcpputils:masterfrom

jacob/update_cpplint_forkros2/rcpputils:jacob/update_cpplint_forkCopy head branch name to clipboard