Use 14.04-specific version of package query function as required by diagnostics and login scripts
Merge pull request #2 from ClearwaterCore/sfr469194

Use 14.04-specific version of package query function as required by diag...