Raise exception if python-apt not installed
Switch nssm back to 32-bit
Merge pull request #18533 from cro/nssm32bit

Upgrade nssm but switch back to 32 bit
jids can't be ints anymore, because we can now set jid names.
Merge pull request #18619 from cro/pg_jid_doc

Document that jids in PG returners need to be varchar not int
Use file.append to write
Update sqlite3.py to enable autocommit

bug same as #18152 
sqlite3 module does not commit changes after 'INSERT' call
Quote for bluez
quote bsd_shadow
don't load stdlib
update timezone.py shell cmds

Conflicts:
	salt/modules/timezone.py
Merge pull request #18774 from rallytime/cp-18150

Backport #18150 to 2014.1
Merge pull request #18797 from sumso/2014.1

Update sqlite3.py to enable autocommit
Merge pull request #16827 from tf198/no-python-apt

Raise exception if python-apt not installed
normalize systemd module commands

Conflicts:
	salt/modules/systemd.py
Cleanup on network mod

Conflicts:
	salt/modules/network.py
Remove cmd_quote
Use file.append
Replace a pint of sed with a pinch of salt
String formatting fixes to modules/zcbuildout.py