eliminate a warning
don't know how this passed before
fix? missing plv8 error
use the proper column name in pg_stat_activity for the postgres version
fix copy/paste err
replace all occurrences of changed column name
simplify testing with diff postgres version (still need to sync this with vagrant_setup.sh manually)
temporarily separate qt-client locking from web client locking
Merge branch '4_7_x' of https://github.com/xtuple/xtuple into i24559_xtlocks
and change language of wipe_views to allow building a database

Conflicts:
	enyo-client/database/source/delete_system_orms.sql
Add personal privilege access to a Contact that is on a Ship To
Merge pull request #1848 from gilmoskowitz/i24559_xtlocks

issue #24559 - locking with pg 9.3 and web vs qt clients
Include the view when building share_users.
Include in manifest
bump to 4.7.0 final
Merge pull request #1857 from gpazo/bump470

bump to 4.7.0 final
Merge pull request #1856 from bendiy/4_7_x

Add personal privilege access to a Customer that a Ship To is on
Merge remote-tracking branch 'XTUPLE/4_7_x' into 1855
use which instead of keycode