Merge lp://qastaging/~chad.smith/charms/trusty/landscape-client/landscape-client-scrub-whitespace into lp://qastaging/charms/trusty/landscape-client

landscape-client charm now strips leading and trailing whitespace from any provided service config settings provided by juju set X=""" Y """. Helps with include-file:// juju-deployer directives that may contain newlines.

landscape-client charm now strips leading and trailing whitespace from any provided service config settings provided by juju.

For dev testing:
juju switch local
juju bootstrap

# setup a landscape account with freshdata
# set account registration key to asdfasdf (example IP of local 'OPL': 192.168.2.11)
echo -e "asdfasdf\n" > /tmp/my-regkey

Use a bundle something like the following:

local-client:
    series: trusty
    services:
        ubuntu:
            charm: cs:trusty/ubuntu-1
            num_units: 1
        landscape-client:
            branch: lp:~chad.smith/charms/trusty/landscape-client/landscape-client-scrub-whitespace
            num_units: 0
            options:
                account-name: onward
                url: http://192.168.2.11:8080/message-system
                ping-url: http://192.168.2.11:8081/ping
                registration-key: include-file:///tmp/my-regkey
    relations:
        - [ubuntu, landscape-client]

# client should register despite the newline in the /tmp/my-regkey
# juju ssh ubuntu/0 'sudo cat /etc/landscape/client.conf'
# ensure registration-key does not contain a newline, like the following:
registration_key = """asdfasdf
"""