tree f27d10e8a7520ec2a81d364a4d21fa268a146c86
parent 93fc6343de11bde4de4e7533241123a7dcc83e70
author Jim Hahn <jrh3@att.com> 1533563596 -0400
committer Jim Hahn <jrh3@att.com> 1533564698 -0400

carry forward template changes

Incorporated changes, to clean-up objects that have no associated Param
object, from the amsterdam rules template into the casablanca rules
template.  Also carried forward changes in behavior of PolicyGuard
lock requests.
Fix typo in comment.
Change tabs to spaces and removing trailing spaces.

Change-Id: Ifcfda573f4c271d804e526d8cc0bea4b89b16612
Issue-ID: POLICY-955
Signed-off-by: Jim Hahn <jrh3@att.com>