Sketch of FLOC-1022.
Sketch of FLOC-1023.
Merge remote-tracking branch 'origin/master' into restart-policy-2-FLOC-727

Conflicts:
	flocker/node/test/test_deploy.py
Add restart_policy to the list of allowed keys
Search and replace retry_policy > restart_policy
Test for correct attribute in test
More incorrect attribute references in restart_policy tests.
Fix an exception test to assertRaises.
Fix the description of the non-dict restart_policy test.
Only supply an Application.restart_policy if one was defined in the config.
Start parsing some policies
The config key is maximum_retry_count
A test for integer validation in RestartOnFailure
make space for an integer test
Raise TypeError if not  int or None
Raise ConfigurationError when TypeError is caught
Test that restart_policy is supplied as  a dict
It's going to be very difficult to distinguish between the TypeErrors raised by characteristic and those raised by object.__init__ and those raised by RestartOnFailure.__init__. So just raise a generic ParsingError with the supplied, invalid config
Something to convert IrestartPolicy to Flocker configuration.
This test failed because the applications_flocker_yaml function always includes a RestartPolicy